Moved into build folder
Refactored doclet code