folder structure change: from braces to statements