change to the dir structure
cleanup