rename of some of the files
Merge branch 'dev-bluebat' of github.com:rfaisal/hellouniverse into dev-bluebat