more changes to chooser, massive amount of renaming/moving