clean up references
reorganise solution