Restructure project
Merge pull request #5 from ngthanhtrung23/master

Restructure project