Services reorganized

Successfully got services organized with new structure