Fixed routing, was conflicting between apps
26 files changed