Simplify work directory layout

This change requires rebuilding everything
as well as manually cleaning work dir before trying to build.

Sorry.