Undid unnecessary refactoring

(Textures work fine, check your build path)