Reorganized names and merged python modules