Rearranging and moving trunk to 1.8.