making sure directory structure is good, misc tweaks;