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