Rick branch

Separated Controllers and Services into individual modules.