Moved stuff into controllers, removed rel service