Moved some stuff around, and started on new gear network code