PEP-8 cleanup

* Renamed overly-generic package directory
* Code formatting
* Unused variable cleanup