Minor file reorganization