Reorganised Usfxr file structure.