cleaned up directory references

preparation for wip pr
minor cosmetic changes