Fixed stuff, moved everything to app folder