minor cleanups
move 1...
move 2...
move 3
cleaning up .gitignore, now that our directory structure is much clearer...