Reorganize everything and move to using routes