adjust directory structure, add some new modules