Added Finder alias
Reorganized