move assets to right place and fix some warnings