Refactor texture stuff
Texture and import changes/cleanups