Package restructuring and PEP8 cleanup