Merge "Move classes from base package to feature packages" into main