Combining services into one service. Also restructured folders.