Project cleanup

Cleaned up a bunch of stuff in the project. Mostly this was code cleanup, but I also rearranged the directory structure under Assets so that things are easier to find and laid out in a more logical manner.