Total overhaul into a module based system