reorganize project structure

reorganize project structure