Start templates cleanup and reorganisation