some changes in workspace and hives layout