Form doc class fix and update project structure to 2.x
Merge pull request #269 from allmobilize/codename-h

Form doc class fix and update project structure to 2.x