reorganizing Surface directory