Import field annotation 'contained-in' done

Can now assert entities in an imported field are contained in a
previously created entity. Commit also has interface fixes, some
reorganizations.