test
Remove test and make clean
Add make
Chang struct
New struct
New arrange
New arranged