#gjms - Lots of stuff. Just check the commit.
#gjmsdev - Forgot to update dependencies. Woops.
Reorganize, fix for PyCharm, now more PEP-8.
I reorganized it this way for easier git management.