[MAL-1] Initial routing and clean-up.