Reordering code , in form of modules