Add Services

Code clean up

#22