Init file added
Renaming and fixing files for PEP8
Merge remote-tracking branch 'origin/master'