Tidy up

centralised commands
tidied api
added service auto loader