python version plus directory layout cleanup