Reorganized folders to accommodate new module.