merged model adaptions to cdmlib 3.2.4 from campanula branch
had to rename the packages to make them compliant with buckminster