update directory structure

updates everything to new directory structure