Redesigned the file structure.