Make Unit component and refactor move
danmerge