Reworking Modules folder structure