Fix path detection for namespaced module
Remove unused support files
Menu ordering