reorganizing the app directory to play well with travis ci
merging commits, hopefully nothing breaks