Add basic elements.
Remove pid file.
Fix directories, roles, config.
Merge remote branch 'origin/develop'