cleanDb.js script added
clean up unsused folders
file structure to be in sync with collector
file structure to be in sync with collector
merge with master
after merge fixes