Removed old files
Moved services to a new package to avoid recursive dependences