restructured folders, unified derivations for different non-linear kinematics