No more given and resource package

And added resource folder