Reorganize Format Builder and Icon Picker files