Update test
Update directory structure