added null construct to parser
moved code files to sub dir
renaming dir
added null construct to parser
Merge branch 'dev'