Reorganizing physics-related classes