Update some paths and instructions to reflect moving modules to folder