Core code updates under way: Pardon any rough edges.

The principle of keeping related code close together to improve readability, maintainability, and reduce the cognitive load of navigating between scattered parts.

Let's be friends