reorganized folder struct