CDT project restructure
Test projects restructure