change directory structure
change directory structure
fix spec