General code reformat due to start using pyCharm
Finished refactoring. Removed some obsolete files. Named functions with lower case to conform standards