[TASK] New folder structure