renamed some files to correspond to their modules
Merge branch 'tempDev' into development