restructure project, introduce intermediate module levels