Reorganize entity property order
Update discriminator map
Split the aspect type class into multiple subclasses, moved calculations to service
Split formula inputs into two types, constant and variable
Merged cycles and formulas into one entity
Removed 'type' from various entities with discriminator maps