Some reorg of Python structure, and added normalize unit test