Working commit before file reorganization.