refactor dirs
fix refs