working on new module structures