diff --git a/CHANGES.txt b/CHANGES.txt
index 0f82632..d631f24 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,7 @@
 Changelog
 =========
 
-1.0.1 (unreleased)
+2.0.0 (unreleased)
 ------------------
 
 - Nothing changed yet.
diff --git a/setup.py b/setup.py
index f8a811d..0c9d412 100644
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,8 @@
-from setuptools import find_packages
 from setuptools import setup
 
 setup(
     name='collective.taskqueue',
-    version='1.0.1.dev0',
+    version='2.0.0.dev0',
     description='Asyncore-based asynchronous task queue for Plone',
     long_description=(open('README.rst').read() + '\n' +
                       open('CHANGES.txt').read()),
@@ -13,14 +12,15 @@
         'Development Status :: 4 - Beta',
         'Environment :: Web Environment',
         'Framework :: Plone',
-        'Framework :: Plone :: 4.3',
-        'Framework :: Plone :: 5.0',
-        'Framework :: Plone :: 5.1',
-        'Framework :: Plone :: 5.2',
+        'Framework :: Plone :: 6.2',
         "Framework :: Plone :: Addon",
         'License :: OSI Approved :: GNU General Public License v2 (GPLv2)',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
+        'Programming Language :: Python :: 3.13',
+        'Programming Language :: Python :: 3.14',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
         'Topic :: Software Development :: Libraries :: Python Modules',
@@ -30,9 +30,6 @@
     author_email='asko.soukka@iki.fi',
     url='https://github.com/collective/collective.taskqueue/',
     license='GPL',
-    packages=find_packages('src', exclude=['ez_setup']),
-    package_dir={'': 'src'},
-    namespace_packages=['collective'],
     include_package_data=True,
     zip_safe=False,
     install_requires=[
diff --git a/src/collective/__init__.py b/src/collective/__init__.py
deleted file mode 100644
index 459e33e..0000000
--- a/src/collective/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# See http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages
-try:
-    __import__("pkg_resources").declare_namespace(__name__)
-except ImportError:
-    from pkgutil import extend_path
-    __path__ = extend_path(__path__, __name__)