started reorganizing app and routes