Moved member variable relationships

Makes further refactoring easier