Split moved Controller and Services to separate files