project layout restructured, pep8 errors fixed also with minor refactorings