Delete and move OK + fix directory creation