improve some displays
Moves units into their own files