Renamed some services
Major refactoring of database