Updated settings, removed package files

Removed redundant package files in favor of just having the package
control file handle it.
Update settings