Better structure to reflect factors within complexities
Less classes, same semantics
Complexities can be summed up now with factors