Shifts to Common module based architecture, adds more comments