Refactored ConstAcc2D -> Motion2D, sim -> universe