Test
Initial Re-structure. Halfway mark, so committing just in case.
Should be the final changes. Testing now, just in case.
For some reason, 4chan appears to be refusing my conncetion. So I'm uploading this branch to share with people to debug.
Fixed it.
Fixed a minor bug
Merge pull request #3 from robertwoodruff/restruct

Applied.