Moved root templates back into root