Change project ctructure