Completely reorganized file structure