Fix routers and module structure