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