Fixed up specs
Simplified Motion
Simplified MotionPart
Refactoring
More refactoring