Move currentdl struct in application, and fix #10