Changed workspace layout, and package hiearchy