Moved to consolidated templates folder
Made readme more helpful
Updated vision doc