Code cleanup & formatting.
Reorganized resource files.
Reorganizing resource files.