changed package layout and pep8