Re-arrange the 3 modules, better organization