Reorganising /src