Completely reorganized folder structure