Merge pull request #261 from compnerd/layout

build: adjust for new build layout