Flatten files. Fix formatting.