Changed service startup procedure
First steps towards new API module
changes to old stuff