diff --git a/src/brut/androlib/ApkDecoder.java b/src/brut/androlib/ApkDecoder.java
new file mode 100644
index 00000000..ccc95826
--- /dev/null
+++ b/src/brut/androlib/ApkDecoder.java
@@ -0,0 +1,125 @@
+/*
+ *  Copyright 2010 Ryszard Wiśniewski <brut.alll@gmail.com>.
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *  under the License.
+ */
+package brut.androlib;
+
+import brut.androlib.res.data.ResTable;
+import brut.androlib.res.util.ExtFile;
+import brut.common.BrutException;
+import brut.util.OS;
+import java.io.File;
+
+/**
+ * @author Ryszard Wiśniewski <brut.alll@gmail.com>
+ */
+public class ApkDecoder {
+    public ApkDecoder() {
+        this(new Androlib());
+    }
+
+    public ApkDecoder(Androlib androlib) {
+        mAndrolib = androlib;
+    }
+
+    public ApkDecoder(File apkFile) {
+        this(apkFile, new Androlib());
+    }
+
+    public ApkDecoder(File apkFile, Androlib androlib) {
+        mAndrolib = androlib;
+        setApkFile(apkFile);
+    }
+
+    public void setApkFile(File apkFile) {
+        mApkFile = new ExtFile(apkFile);
+        mResTable = null;
+    }
+
+    public void setOutDir(File outDir) throws AndrolibException {
+        try {
+            mOutDir = outDir;
+            OS.rmdir(outDir);
+            outDir.mkdirs();
+        } catch (BrutException ex) {
+            throw new AndrolibException(ex);
+        }
+    }
+
+    public void decode() throws AndrolibException {
+        File outDir = getOutDir();
+        switch (mDecodeSources) {
+            case DECODE_SOURCES_NONE:
+                mAndrolib.decodeSourcesRaw(mApkFile, outDir);
+                break;
+            case DECODE_SOURCES_SMALI:
+                mAndrolib.decodeSourcesSmali(mApkFile, outDir);
+                break;
+        }
+        switch (mDecodeResources) {
+            case DECODE_RESOURCES_NONE:
+                mAndrolib.decodeResourcesRaw(mApkFile, outDir);
+                break;
+            case DECODE_RESOURCES_FULL:
+                mAndrolib.decodeResourcesFull(mApkFile, outDir, getResTable());
+                break;
+        }
+        mAndrolib.decodeRawFiles(mApkFile, outDir);
+    }
+
+    public void setDecodeSources(short mode) throws AndrolibException {
+        if (mode != DECODE_SOURCES_NONE && mode != DECODE_SOURCES_SMALI) {
+            throw new AndrolibException("Invalid decode sources mode: " + mode);
+        }
+        mDecodeSources = mode;
+    }
+
+    public void setDecodeResources(short mode) throws AndrolibException {
+        if (mode != DECODE_RESOURCES_NONE && mode != DECODE_RESOURCES_FULL) {
+            throw new AndrolibException("Invalid decode resources mode");
+        }
+        mDecodeResources = mode;
+    }
+
+    public ResTable getResTable() throws AndrolibException {
+        if (mResTable == null) {
+            mResTable = mAndrolib.getResTable(mApkFile);
+        }
+        return mResTable;
+    }
+
+
+    public final static short DECODE_SOURCES_NONE = 0x0000;
+    public final static short DECODE_SOURCES_SMALI = 0x0001;
+
+    public final static short DECODE_RESOURCES_NONE = 0x0100;
+    public final static short DECODE_RESOURCES_FULL = 0x0101;
+
+
+    private File getOutDir() throws AndrolibException {
+        if (mOutDir == null) {
+            throw new AndrolibException("Out dir not set");
+        }
+        return mOutDir;
+    }
+
+    private final Androlib mAndrolib;
+
+    private ExtFile mApkFile;
+    private File mOutDir;
+    private ResTable mResTable;
+    private short mDecodeSources = DECODE_SOURCES_SMALI;
+    private short mDecodeResources = DECODE_RESOURCES_FULL;
+}