dir cleanup and adding set files
huge commit with a bunch of set stuff