Reorganize, fix for PyCharm, now more PEP-8.
I reorganized it this way for easier git management.
Merge pull request #5 from HmmmQuestionMark/master

#gjmsdev - @theHQM - Reorganize, fix for PyCharm, now more PEP-8.