diff --git a/.gitignore b/.gitignore
index e5d04c0..ac29f95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,6 @@
 *.cbr
 .idea
 build
-KindleComicConverter.egg-info
\ No newline at end of file
+KindleComicConverter.egg-info
+awkcc
+dist
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 51c3389..3e9e43d 100644
--- a/setup.py
+++ b/setup.py
@@ -1,17 +1,17 @@
 """
-py2app/py2exe build script for MyApplication.
+py2app/py2exe build script for KCC.
 
 Will automatically ensure that all build prerequisites are available
 via ez_setup
 
 Usage (Mac OS X):
-    python setup.py py2app
+    python setup.py build
 
 Usage (Windows):
-    python setup.py py2exe
+    python setup.py build
 """
-import ez_setup
-ez_setup.use_setuptools()
+from ez_setup import use_setuptools
+use_setuptools()
 
 import sys
 from setuptools import setup
diff --git a/setup_console.py b/setup_console.py
new file mode 100644
index 0000000..335d33c
--- /dev/null
+++ b/setup_console.py
@@ -0,0 +1,14 @@
+"""
+py2app/py2exe build script for KCC No-GUI release.
+
+Usage (Windows):
+    python setup.py py2exe
+"""
+from distutils.core import setup
+import sys
+import py2exe
+sys.path.insert(0, 'kcc')
+
+setup(
+        console=['kcc/comic2ebook.py', 'kcc/kindlestrip.py'],
+)
diff --git a/setup_cx.py b/setup_cx.py
deleted file mode 100644
index 748c418..0000000
--- a/setup_cx.py
+++ /dev/null
@@ -1,86 +0,0 @@
-"""
-py2app/py2exe build script for MyApplication.
-
-Will automatically ensure that all build prerequisites are available
-via ez_setup
-
-Usage (Mac OS X):
-    python setup_cx.py bdist_dmg
-
-Usage (Windows):
-    python setup_cx.py bdist_msi
-"""
-import sys
-from cx_Freeze import setup, Executable
-
-NAME='KindleComicConverter'
-VERSION="2.4"
-mainscript = 'kcc.py'
-
-base = None
-
-if sys.platform == 'darwin':
-    extra_options = dict(
-        bundle-iconfile='resources/comic2ebook.icns',
-        volume-label=NAME + " " + VERSION
-        app=[mainscript],
-        options=dict(
-            py2app=dict(
-                argv_emulation=True,
-                iconfile='resources/comic2ebook.icns',
-                plist=dict(
-                    CFBundleName               = NAME,
-                    CFBundleShortVersionString = VERSION,
-                    CFBundleGetInfoString      = NAME + " " + VERSION + ", written 2012-2013 by Ciro Mattia Gonano",
-                    CFBundleExecutable         = NAME,
-                    CFBundleIdentifier         = 'com.github.ciromattia.kcc',
-                    CFBundleSignature       = 'dplt'
-                )
-            )
-        )
-    )
-elif sys.platform == 'win32':
-    base = "Win32GUI"
-    extra_options = dict(
-        upgrade-code = 'KindleComicConverter',
-        executables = [Executable("kcc.py", base=base)]
-    )
-else:
-    extra_options = dict(
-        # Normally unix-like platforms will use "setup.py install"
-        # and install the main script as such
-        scripts=[mainscript],
-    )
-
-options = dict(
-
-)
-
-setup(
-    name=NAME,
-    version=VERSION,
-    author="Ciro Mattia Gonano",
-    author_email="ciromattia@gmail.com",
-    description=("A tool to convert comics (CBR/CBZ/PDFs/image folders) to Mobipocket."),
-    license = "ISC License (ISCL)",
-    keywords = "kindle comic mobipocket mobi cbz cbr manga",
-    url = "http://github.com/ciromattia/kcc",
-    classifiers=[
-        'Development Status :: 4 - Beta'
-        'License :: OSI Approved :: ISC License (ISCL)',
-        'Environment :: Console',
-        'Environment :: MacOS X',
-        'Environment :: Win32 (MS Windows)',
-        'Environment :: X11 Applications',
-        'Intended Audience :: End Users/Desktop',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 3',
-        'Topic :: Multimedia :: Graphics :: Graphics Conversion',
-        'Topic :: Utilities'
-    ],
-    # make sure to add custom_fixers to the MANIFEST.in
-    include_package_data=True,
-    executables = [Executable("kcc.py", base=base)]),
-    **extra_options
-)