diff --git a/MANIFEST b/MANIFEST
index fce5378..0bd24de 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -2,10 +2,10 @@ Changes
 LICENSE
 Makefile.PL
 MANIFEST			This list of files
-Piece.pm
+lib/Time/Piece.pm
 Piece.xs
 README
-Seconds.pm
+lib/Time/Seconds.pm
 t/01base.t
 t/02core.t
 t/02core_dst.t
diff --git a/Makefile.PL b/Makefile.PL
index 0053c95..2f2d46f 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -4,9 +4,9 @@ require 5.006;
 
 WriteMakefile(
     'NAME'	=> 'Time::Piece',
-    'VERSION_FROM' => 'Piece.pm', # finds $VERSION
+    'VERSION_FROM' => 'lib/Time/Piece.pm', # finds $VERSION
     'AUTHOR' => 'Matt Sergeant',
-    'ABSTRACT_FROM' => 'Piece.pm',
+    'ABSTRACT_FROM' => 'lib/Time/Piece.pm',
     'INSTALLDIRS' => ( ($] >= 5.009005 and $] < 5.011) ? 'perl' : 'site'),
     #'CCFLAGS' => '-Wall -Wextra',
     'PREREQ_PM' => { Exporter => '5.57' },
diff --git a/Piece.pm b/lib/Time/Piece.pm
similarity index 100%
rename from Piece.pm
rename to lib/Time/Piece.pm
diff --git a/Seconds.pm b/lib/Time/Seconds.pm
similarity index 100%
rename from Seconds.pm
rename to lib/Time/Seconds.pm