remove workspace
organize project a bit