Added some content files & refactored code.

Added some content files & refactored code.