more refactoring of physics modules