Added chdir support
Removed unused class