Fixed copypaste
Library refactoring
Renamed services
setup.py