organizing project e some improve to templates