2.3 file reorganization

Merging file reorganization into base develop branch