Cleanup: Package files, config files
small fixes