Move templtes into same folder as views