Revert super class for directories and set model class