Moved relationships to separate files, work on relationship caching