Change: Huge Refactoring using new CoreClasses. Improves Modularity and
decreases repetetive Code