Added the refactored files.

And minor changes to the hello world sample.