Reorganized folder and file structure