build: aggressive refactoring