reverts change to put classes in a 'configuration' folder