Reorganize, make a variant of dir that works with aliases