Reorganize support files