[Task] correct folder hierarchy