Cleanup

It's better to review each commit.

Moving folders around and renaming variables, biggest change is to the errors and exceptions.

Ready to be merged.