mv from surplus directory
fixed bug in editor