diff --git a/mozilla/webtools/PLIF/PLIF/Service/AdminCommands.pm b/mozilla/webtools/PLIF/PLIF/Service/Components/AdminCommands.pm
similarity index 98%
rename from mozilla/webtools/PLIF/PLIF/Service/AdminCommands.pm
rename to mozilla/webtools/PLIF/PLIF/Service/Components/AdminCommands.pm
index 06e258c107f..52c36a3b60c 100644
--- a/mozilla/webtools/PLIF/PLIF/Service/AdminCommands.pm
+++ b/mozilla/webtools/PLIF/PLIF/Service/Components/AdminCommands.pm
@@ -26,7 +26,7 @@
 # provisions above, a recipient may use your version of this file
 # under either the MPL or the GPL.
 
-package PLIF::Service::AdminCommands;
+package PLIF::Service::Component::AdminCommands;
 use strict;
 use vars qw(@ISA);
 use PLIF::Service;
diff --git a/mozilla/webtools/PLIF/PLIF/Service/Login.pm b/mozilla/webtools/PLIF/PLIF/Service/Components/Login.pm
similarity index 99%
rename from mozilla/webtools/PLIF/PLIF/Service/Login.pm
rename to mozilla/webtools/PLIF/PLIF/Service/Components/Login.pm
index f9efef5f4c0..9fdef3c04bf 100644
--- a/mozilla/webtools/PLIF/PLIF/Service/Login.pm
+++ b/mozilla/webtools/PLIF/PLIF/Service/Components/Login.pm
@@ -26,7 +26,7 @@
 # provisions above, a recipient may use your version of this file
 # under either the MPL or the GPL.
 
-package PLIF::Service::Login;
+package PLIF::Service::Component::Login;
 use strict;
 use vars qw(@ISA);
 use PLIF::Service;