Add other dirs
cleanup specs