restructuring project now that I no longer need modules