Restructured Batchfile