Separate public and system files
Merge branch 'master' of https://github.com/juice49/Monal into juice49-master