renamed paths and files to fit bdms
Merge remote-tracking branch 'origin/restructure' into restructure