PEP8 cleanups, add subfolder to PYTHONPATH