fixing imports
pep8 compliance, removing redundant files