Moved stuff into a templates folder