Refactor Project
Merge pull request #1 from tctcl/tjk_refactor_project

Refactor Project