Update directory structure
Modules rename