[major] Internals refactor