fix project structure so publishes are correct
Merge branch 'master' into develop