Moved non-controllers to separate file