reorganise source and start spec work