refactor folder organization and renaming stuff

general cleanup, no behaviour changed 
Perhaps introduce a new binding for the expression before assigning. It's weird to assign to a compound expression like this.