moved a couple classes into their own files simplified unit spawning refactored some unit form stuff for clarity some more unit form refactoring