Fix templates and controllers name spaces