Moving things out of public
Merge branch 'develop'