reorganize project structure
Merge pull request #6 from mwacc/develop

reorganize project structure