refact, progress towards hard coupling and module-coupling code unification