updated paths and filenames
Merge branch 'master' of https://github.com/niftytushar/embarc-utils