Reworking directories after C++ merge
Moved primary into 1.0.3 after merge