Reorganise src structure