Moved templates and routng config back to addressing bundle