Revise module organization