Large cleanups. Reintegrating all modules together for a guest