Flatten directories, eclipse branch forked for eclipse edit