refactor data dirs to be easier to work with.