[new model] wip folder structure