Done some high level refactoring to optimize usages and rename classes, have fixed a few overrides as well as moving enums to their own namespace.