Merge pull request #351 from timiblossom/master

Some Priam fixes related to restore
Change version to 2.0
Add -SNAPSHOT to the version
add minor version as -snapshot does have problem with our build.
Restructure dse stuffs and clean out files that we don't need or use.