Reformatted controllers and services slightly