Removes deprecated files
Fixes packaging
Merge branch 'master' into drobofs