Refactorred Python modules