Refactoring files in Kinematics