Switch back to dired, refactor props