diff --git a/setup.py b/setup.py
index 7c02de3..613ec67 100755
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ from setuptools import setup, find_packages
 
 LICENSE_PATH = os.path.join(os.path.dirname(__file__), 'LICENSE')
 README_PATH = os.path.join(os.path.dirname(__file__), 'readme.org')
-VERSION_PATH = os.path.join(os.path.dirname(__file__), 'parser', 'version.py')
+VERSION_PATH = os.path.join(os.path.dirname(__file__), 'eorg', 'version.py')
 version = {}
 with open(VERSION_PATH) as fp:
     exec(fp.read(), version)
@@ -31,7 +31,6 @@ setup(
       classifiers=[
         'Intended Audience :: Developers',
         'License :: OSI Approved :: GPL-3 License',
-        'Environment :: Web Environment',
         'Development Status :: 5 - Production/Stable',
         'Programming Language :: Python',
         'Operating System :: OS Independent',
@@ -39,6 +38,13 @@ setup(
         'Topic :: Internet',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Internet :: WWW/HTTP :: WSGI',
+        'Topic :: Internet :: WWW/HTTP :: Dynamic Content :: CGI Tools/Libraries',
+        'Topic :: Internet :: WWW/HTTP :: Site Management',
+        'Topic :: Software Development :: Documentation',
+        'Topic :: Software Development :: Libraries :: Python Modules',
+        'Topic :: Text Processing :: Markup',
+        'Topic :: Text Processing :: Filters',
+        'Topic :: Text Processing :: Markup :: HTML',
       ],
 
     install_requires=[],