[CHORE] fix folder structure