diff --git a/var/spack/packages/adios/package.py b/var/spack/repos/builtin/packages/adios/package.py
similarity index 65%
rename from var/spack/packages/adios/package.py
rename to var/spack/repos/builtin/packages/adios/package.py
index 260dcbe851..9e0452ba6f 100644
--- a/var/spack/packages/adios/package.py
+++ b/var/spack/repos/builtin/packages/adios/package.py
@@ -1,15 +1,18 @@
 import os
 
 from spack import *
+
+
 class Adios(Package):
-    """The Adaptable IO System (ADIOS) provides a simple, 
-        flexible way for scientists to describe the 
-        data in their code that may need to be written, 
-        read, or processed outside of the running simulation
     """
-    
+    The Adaptable IO System (ADIOS) provides a simple,
+    flexible way for scientists to describe the
+    data in their code that may need to be written,
+    read, or processed outside of the running simulation
+    """
+
     homepage = "http://www.olcf.ornl.gov/center-projects/adios/"
-    url      = "http://users.nccs.gov/~pnorbert/adios-1.9.0.tar.gz"
+    url = "http://users.nccs.gov/~pnorbert/adios-1.9.0.tar.gz"
 
     version('1.9.0', 'dbf5cb10e32add2f04c9b4052b7ffa76')
 
@@ -22,13 +25,13 @@ class Adios(Package):
     depends_on('mxml')
 
     def install(self, spec, prefix):
-        configure_args = ["--prefix=%s" % prefix, 
-                          "--with-mxml=%s" % spec['mxml'].prefix, 
+        configure_args = ["--prefix=%s" % prefix,
+                          "--with-mxml=%s" % spec['mxml'].prefix,
                           "--with-hdf5=%s" % spec['hdf5'].prefix,
                           "--with-netcdf=%s" % os.environ["NETCDF_DIR"],
                           "--with-infiniband=no",
-                          "MPICC=cc","MPICXX=CC","MPIFC=ftn",
-                          "CPPFLAGS=-DMPICH_IGNORE_CXX_SEEK"] 
+                          "MPICC=cc", "MPICXX=CC", "MPIFC=ftn",
+                          "CPPFLAGS=-DMPICH_IGNORE_CXX_SEEK"]
 
         if spec.satisfies('%gcc'):
             configure_args.extend(["CC=gcc", "CXX=g++", "FC=gfortran"])
diff --git a/var/spack/packages/mxml/package.py b/var/spack/repos/builtin/packages/mxml/package.py
similarity index 61%
rename from var/spack/packages/mxml/package.py
rename to var/spack/repos/builtin/packages/mxml/package.py
index f79251d312..254a5f1595 100644
--- a/var/spack/packages/mxml/package.py
+++ b/var/spack/repos/builtin/packages/mxml/package.py
@@ -1,14 +1,15 @@
-import os
 from spack import *
 
+
 class Mxml(Package):
-    """Mini-XML is a small XML library that you can use to read and write XML 
-       and XML-like data files in your application without requiring large 
-       non-standard libraries
+    """
+    Mini-XML is a small XML library that you can use to read and write XML
+    and XML-like data files in your application without requiring large
+    non-standard libraries
     """
 
     homepage = "http://www.msweet.org"
-    url      = "http://www.msweet.org/files/project3/mxml-2.9.tar.gz"
+    url = "http://www.msweet.org/files/project3/mxml-2.9.tar.gz"
 
     version('2.9', 'e21cad0f7aacd18f942aa0568a8dee19')
     version('2.8', 'd85ee6d30de053581242c4a86e79a5d2')
@@ -16,11 +17,11 @@ class Mxml(Package):
     version('2.6', '68977789ae64985dddbd1a1a1652642e')
     version('2.5', 'f706377fba630b39fa02fd63642b17e5')
 
-    # module swap PrgEnv-intel PrgEnv-$COMP (Can use whatever compiler you want to use) 
+    # module swap PrgEnv-intel PrgEnv-$COMP
+    # (Can use whatever compiler you want to use)
     # Case statement to change CC and CXX flags
 
     def install(self, spec, prefix):
         configure('--prefix=%s' % prefix, "--disable-shared", 'CFLAGS=-static')
         make()
         make("install")
-