Moved classes to the right package
Created a factory for AdminService instances