Delete top-level modules and fix mgmt cmd