added Category and Target enums to move package, refactored moves to use category enum