moved everything out of app directory