Reorganize project, suport Razor literate templates, more tests
Merge changes