Refactor assets
Merge remote-tracking branch 'origin/gdx-update' into gdx-update