change directory structure and make it easy to install