moved assets around, better organization