redoing directory structure