Revert "some refactoring and fixing things around. preparing for shadow volume implmementation..."

This reverts commit b3798a4c077fc7b872b4343a017fb40f823037e3.