restructured folder hierarchy