Cleaned up workspace structure