File structure

Changing the file structure to be a little cleaner, and to make room for new additions as scope creep overtakes me.