change dir structured to acct for multiple classes