Revise refactoring plan based on user feedback - keep ObjectQL components together

Co-authored-by: hotlong <50353452+hotlong@users.noreply.github.com>

Author: Copilot