Add admin namespace
Change routes to admin namespace
fix merge conflicts