More modular installers
Build cleanup