PEP8.
Become more structured.
Deleted two files.
Merge branch 'dev'