Cleanup; merge routes files