Moved some code and simplified shader related stuff.