Moved templates closer to views