Renamed a few files and cleaned up controller setup on routing