Use resource package, delete older code