[WIP] Moved modules to root