more clean ups, add flag indicating if file is to be moved to done folder