Fix some python package layout issues