Problems with migration from MPS 1.5 to 2.0

Hi,

I just tried to migrate my MPS 1.5-Project to MPS 2.0.

Following problems:

1. All references to external libraries are broken. I needed to completely reenter the dependencies to my dependency solution and to add them again as imported models for the generator. (I've seen that the imported models are now made more qualified in the form "solution/model". In 1.5 it was only by model name, which may be the cause for this problem.)
   
2. After fixing the external libraries and imported models all generator annotations are lost!!! Instead there are errors saying "Error: Child in a role with unknown link". This holds for all types of makros (property, node, reference, ...). I suppose that by changing the references to the Java-Stubs, the annotations' links to the node properties are broken.

How to proceed??

By the way there was an option "Included in VCS" for external libraries. Is there something similar in MPS2.0?

- - *UPDATE*: - -
*ad1*: I was able to fix the external libraries by including the libraries to my project before migrating. However, in the generator properties, the imported models are still marked as unresolved (red).
*ad2*: The annotations are lost immediately, so directly after checking the project out from SVN.