Reorganized file structure to be flatter