Adapted file structure to be able to smartly convert references