Module restructure to reflect changes