More Reorganization

Also started writing USB I/O