Reorganized folder structure