organzing things a bit better
fixing up the services