Created a new folder organization for the code base
Merge commit 'e2de1ccb90d80269800b3cfa0ac9ccfefd6cab82'