Break off fes controller into it's own file. Rename the data access modules to have more appropriate names.