Minor changes in project structure; Workspace manager skeleton