Slowly converting each module to be compatible with the new folder structure