Merge pull request #1 from kwaledesign/dev

file renaming
misc updates