construction builder reorganization
Merge pull request #15 from vapolyakov/master

construction builder reorganization