reorganise code and projects