dramatic dir refactor

durp refactor ಠ_ಠ