Modernised package files
Fixed conflicts