reorgnize the project structure, change the declaration of modules