Core: Complete refactorization

## Ready State: No