cr 2 - Keep the head clean + folder structure