master
refactor: large-scale project restructuring and module consolidation
second batch refactorings