Merge "Refactor SOL003 Adapter to organize its modules"