moved all the app stuff to one directory