Re-organization of the package structure of the SCAP data model, and associated import statement changes throughout the code.