Reorg of code
Reorg of code
Moving stuff out of the main vaxia module into other modules for sane updates later