Fix relationships in opportunity. Separate some files.