[++] refactor folder layout