Moved assets
More asset shuffling
Cleanup