Removed aspect discriminator column and classes
Renamed tables/columns from aspect category to aspect type
Combined the concepts of templates and components into just components