restructuring things

yes