cleaned up files, setting proper dir