fix packages and subfolders for distribution
fix pep8 violations