Update project structure
Merge pull request #14 from mortardata/jkarn_update

[#73798728] Update project structure