Redesign of motion - it is now a component of higher level entity.