fixed workspace structure
fixed project structure
fixed project references