file refactoring

Largely a content free file refactoring.