Make profiles consistend & remove some classes

Fixes #77.
Fix adding/deleting choices/associations

Fixes #75.