Big cleanup

I moved everything up a directory and put all of the apps into a package. Let me know what you think