Reorganized folder hierarchy