[LIB-9] Fix some class dependencies between modules