project structure reshuffle