Improve messages
Introduce a product directory
Abstract out the work directory