Reorganize, fix for PyCharm, now more PEP-8.

I reorganized it this way for easier git management.