Changed the iRODS hierarchy to the actual one, changed the model - added a GeneralFile, but it's not used yet (in development)