Restructuring files in anticipation of unit tests.