Refactoring
Merge pull request #1 from versusvoid/master

Refactoring, partial vk template parsing