Rename main folder, some formatting - pep8