Semi-encapsulated the core/api dependency graphs and created a proper structure to load eager singletons