Refactored (moved) class to simplify dependencies
28 files changed