refactor and reorged
Merge pull request #9 from jinlee0908/lee

refactor and reorged