File organization cleanup.