some restructuring & PEP updates
More PEP updates