Working on code structure.
Merge branch 'master' of https://github.com/alvinlao/charm
attempting to merge out stuffs
Merge branch 'master' of https://github.com/alvinlao/charm