diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8350017
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,23 @@
+/source/nytprof.out
+/source/nytprof
+/source/temp
+*_flymake.*
+/temp/
+blib/
+.build/
+_build/
+cover_db/
+/source/covered/*
+inc/
+Build
+Build.bat
+.last_cover_stats
+Makefile
+Makefile.old
+MANIFEST.bak
+META.yml
+MYMETA.yml
+nytprof.out
+pm_to_blib
+/source/perltidy.LOG
+/source/Test-DBIC-ExpectedQueries-*
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index ed5497e..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,379 +0,0 @@
-This software is copyright (c) 2020 by Johan Lindstrom.
-
-This is free software; you can redistribute it and/or modify it under
-the same terms as the Perl 5 programming language system itself.
-
-Terms of the Perl programming language system itself
-
-a) the GNU General Public License as published by the Free
-   Software Foundation; either version 1, or (at your option) any
-   later version, or
-b) the "Artistic License"
-
---- The GNU General Public License, Version 1, February 1989 ---
-
-This software is Copyright (c) 2020 by Johan Lindstrom.
-
-This is free software, licensed under:
-
-  The GNU General Public License, Version 1, February 1989
-
-                    GNU GENERAL PUBLIC LICENSE
-                     Version 1, February 1989
-
- Copyright (C) 1989 Free Software Foundation, Inc.
- 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The license agreements of most software companies try to keep users
-at the mercy of those companies.  By contrast, our General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  The
-General Public License applies to the Free Software Foundation's
-software and to any other program whose authors commit to using it.
-You can use it for your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Specifically, the General Public License is designed to make
-sure that you have the freedom to give away or sell copies of free
-software, that you receive source code or can get it if you want it,
-that you can change the software or use pieces of it in new free
-programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of a such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must tell them their rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any program or other work which
-contains a notice placed by the copyright holder saying it may be
-distributed under the terms of this General Public License.  The
-"Program", below, refers to any such program or work, and a "work based
-on the Program" means either the Program or any work containing the
-Program or a portion of it, either verbatim or with modifications.  Each
-licensee is addressed as "you".
-
-  1. You may copy and distribute verbatim copies of the Program's source
-code as you receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice and
-disclaimer of warranty; keep intact all the notices that refer to this
-General Public License and to the absence of any warranty; and give any
-other recipients of the Program a copy of this General Public License
-along with the Program.  You may charge a fee for the physical act of
-transferring a copy.
-
-  2. You may modify your copy or copies of the Program or any portion of
-it, and copy and distribute such modifications under the terms of Paragraph
-1 above, provided that you also do the following:
-
-    a) cause the modified files to carry prominent notices stating that
-    you changed the files and the date of any change; and
-
-    b) cause the whole of any work that you distribute or publish, that
-    in whole or in part contains the Program or any part thereof, either
-    with or without modifications, to be licensed at no charge to all
-    third parties under the terms of this General Public License (except
-    that you may choose to grant warranty protection to some or all
-    third parties, at your option).
-
-    c) If the modified program normally reads commands interactively when
-    run, you must cause it, when started running for such interactive use
-    in the simplest and most usual way, to print or display an
-    announcement including an appropriate copyright notice and a notice
-    that there is no warranty (or else, saying that you provide a
-    warranty) and that users may redistribute the program under these
-    conditions, and telling the user how to view a copy of this General
-    Public License.
-
-    d) You may charge a fee for the physical act of transferring a
-    copy, and you may at your option offer warranty protection in
-    exchange for a fee.
-
-Mere aggregation of another independent work with the Program (or its
-derivative) on a volume of a storage or distribution medium does not bring
-the other work under the scope of these terms.
-
-  3. You may copy and distribute the Program (or a portion or derivative of
-it, under Paragraph 2) in object code or executable form under the terms of
-Paragraphs 1 and 2 above provided that you also do one of the following:
-
-    a) accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of
-    Paragraphs 1 and 2 above; or,
-
-    b) accompany it with a written offer, valid for at least three
-    years, to give any third party free (except for a nominal charge
-    for the cost of distribution) a complete machine-readable copy of the
-    corresponding source code, to be distributed under the terms of
-    Paragraphs 1 and 2 above; or,
-
-    c) accompany it with the information you received as to where the
-    corresponding source code may be obtained.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form alone.)
-
-Source code for a work means the preferred form of the work for making
-modifications to it.  For an executable file, complete source code means
-all the source code for all modules it contains; but, as a special
-exception, it need not include source code for modules which are standard
-libraries that accompany the operating system on which the executable
-file runs, or for standard header files or definitions files that
-accompany that operating system.
-
-  4. You may not copy, modify, sublicense, distribute or transfer the
-Program except as expressly provided under this General Public License.
-Any attempt otherwise to copy, modify, sublicense, distribute or transfer
-the Program is void, and will automatically terminate your rights to use
-the Program under this License.  However, parties who have received
-copies, or rights to use copies, from you under this General Public
-License will not have their licenses terminated so long as such parties
-remain in full compliance.
-
-  5. By copying, distributing or modifying the Program (or any work based
-on the Program) you indicate your acceptance of this license to do so,
-and all its terms and conditions.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the original
-licensor to copy, distribute or modify the Program subject to these
-terms and conditions.  You may not impose any further restrictions on the
-recipients' exercise of the rights granted herein.
-
-  7. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of the license which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-the license, you may choose any version ever published by the Free Software
-Foundation.
-
-  8. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  9. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  10. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-        Appendix: How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to humanity, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these
-terms.
-
-  To do so, attach the following notices to the program.  It is safest to
-attach them to the start of each source file to most effectively convey
-the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 1, or (at your option)
-    any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) 19xx name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the
-appropriate parts of the General Public License.  Of course, the
-commands you use may be called something other than `show w' and `show
-c'; they could even be mouse-clicks or menu items--whatever suits your
-program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  program `Gnomovision' (a program to direct compilers to make passes
-  at assemblers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
---- The Artistic License 1.0 ---
-
-This software is Copyright (c) 2020 by Johan Lindstrom.
-
-This is free software, licensed under:
-
-  The Artistic License 1.0
-
-The Artistic License
-
-Preamble
-
-The intent of this document is to state the conditions under which a Package
-may be copied, such that the Copyright Holder maintains some semblance of
-artistic control over the development of the package, while giving the users of
-the package the right to use and distribute the Package in a more-or-less
-customary fashion, plus the right to make reasonable modifications.
-
-Definitions:
-
-  - "Package" refers to the collection of files distributed by the Copyright
-    Holder, and derivatives of that collection of files created through
-    textual modification. 
-  - "Standard Version" refers to such a Package if it has not been modified,
-    or has been modified in accordance with the wishes of the Copyright
-    Holder. 
-  - "Copyright Holder" is whoever is named in the copyright or copyrights for
-    the package. 
-  - "You" is you, if you're thinking about copying or distributing this Package.
-  - "Reasonable copying fee" is whatever you can justify on the basis of media
-    cost, duplication charges, time of people involved, and so on. (You will
-    not be required to justify it to the Copyright Holder, but only to the
-    computing community at large as a market that must bear the fee.) 
-  - "Freely Available" means that no fee is charged for the item itself, though
-    there may be fees involved in handling the item. It also means that
-    recipients of the item may redistribute it under the same conditions they
-    received it. 
-
-1. You may make and give away verbatim copies of the source form of the
-Standard Version of this Package without restriction, provided that you
-duplicate all of the original copyright notices and associated disclaimers.
-
-2. You may apply bug fixes, portability fixes and other modifications derived
-from the Public Domain or from the Copyright Holder. A Package modified in such
-a way shall still be considered the Standard Version.
-
-3. You may otherwise modify your copy of this Package in any way, provided that
-you insert a prominent notice in each changed file stating how and when you
-changed that file, and provided that you do at least ONE of the following:
-
-  a) place your modifications in the Public Domain or otherwise make them
-     Freely Available, such as by posting said modifications to Usenet or an
-     equivalent medium, or placing the modifications on a major archive site
-     such as ftp.uu.net, or by allowing the Copyright Holder to include your
-     modifications in the Standard Version of the Package.
-
-  b) use the modified Package only within your corporation or organization.
-
-  c) rename any non-standard executables so the names do not conflict with
-     standard executables, which must also be provided, and provide a separate
-     manual page for each non-standard executable that clearly documents how it
-     differs from the Standard Version.
-
-  d) make other distribution arrangements with the Copyright Holder.
-
-4. You may distribute the programs of this Package in object code or executable
-form, provided that you do at least ONE of the following:
-
-  a) distribute a Standard Version of the executables and library files,
-     together with instructions (in the manual page or equivalent) on where to
-     get the Standard Version.
-
-  b) accompany the distribution with the machine-readable source of the Package
-     with your modifications.
-
-  c) accompany any non-standard executables with their corresponding Standard
-     Version executables, giving the non-standard executables non-standard
-     names, and clearly documenting the differences in manual pages (or
-     equivalent), together with instructions on where to get the Standard
-     Version.
-
-  d) make other distribution arrangements with the Copyright Holder.
-
-5. You may charge a reasonable copying fee for any distribution of this
-Package.  You may charge any fee you choose for support of this Package. You
-may not charge a fee for this Package itself. However, you may distribute this
-Package in aggregate with other (possibly commercial) programs as part of a
-larger (possibly commercial) software distribution provided that you do not
-advertise this Package as a product of your own.
-
-6. The scripts and library files supplied as input to or produced as output
-from the programs of this Package do not automatically fall under the copyright
-of this Package, but belong to whomever generated them, and may be sold
-commercially, and may be aggregated with this Package.
-
-7. C or perl subroutines supplied by you and linked into this Package shall not
-be considered part of this Package.
-
-8. The name of the Copyright Holder may not be used to endorse or promote
-products derived from this software without specific prior written permission.
-
-9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-The End
-
diff --git a/MANIFEST b/MANIFEST
deleted file mode 100644
index 375a0fe..0000000
--- a/MANIFEST
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was automatically generated by Dist::Zilla::Plugin::Manifest v6.014.
-Changes
-LICENSE
-MANIFEST
-MANIFEST.SKIP
-META.yml
-Makefile.PL
-README
-dist.ini
-lib/Test/DBIC/ExpectedQueries.pm
-lib/Test/DBIC/ExpectedQueries/Query.pm
-t/author-pod-syntax.t
-t/class.t
-t/queries.t
-t/query.t
-t/stack_trace.t
-t/subroutine.t
diff --git a/META.yml b/META.yml
deleted file mode 100644
index 73a75e9..0000000
--- a/META.yml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-abstract: 'Test that only expected DBIx::Class queries are run'
-author:
-  - 'Johan Lindstrom <johanl@cpan.org>'
-build_requires:
-  Test::Deep: '0'
-  Test::Warnings: '0'
-  lib: '0'
-  strict: '0'
-  warnings: '0'
-configure_requires:
-  ExtUtils::MakeMaker: '0'
-dynamic_config: 0
-generated_by: 'Dist::Zilla version 6.014, CPAN::Meta::Converter version 2.150010'
-license: perl
-meta-spec:
-  url: http://module-build.sourceforge.net/META-spec-v1.4.html
-  version: '1.4'
-name: Test-DBIC-ExpectedQueries
-requires:
-  Carp: '0'
-  DBIx::Class: '0'
-  Devel::StackTrace: '0'
-  Exporter::Tiny: '0'
-  Moo: '0'
-  Test::More: '0'
-  Try::Tiny: '0'
-  autobox::Core: '0'
-  autobox::Transform: '0'
-resources:
-  bugtracker: https://github.com/jplindstrom/p5-Test-DBIC-ExpectedQueries/issues
-version: '2.002'
-x_generated_by_perl: v5.26.1
-x_serialization_backend: 'YAML::Tiny version 1.73'
-x_spdx_expression: 'Artistic-1.0-Perl OR GPL-1.0-or-later'
diff --git a/Makefile.PL b/Makefile.PL
deleted file mode 100644
index b77fce7..0000000
--- a/Makefile.PL
+++ /dev/null
@@ -1,70 +0,0 @@
-# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v6.014.
-use strict;
-use warnings;
-
-
-
-use ExtUtils::MakeMaker;
-
-my %WriteMakefileArgs = (
-  "ABSTRACT" => "Test that only expected DBIx::Class queries are run",
-  "AUTHOR" => "Johan Lindstrom <johanl\@cpan.org>",
-  "CONFIGURE_REQUIRES" => {
-    "ExtUtils::MakeMaker" => 0
-  },
-  "DISTNAME" => "Test-DBIC-ExpectedQueries",
-  "LICENSE" => "perl",
-  "NAME" => "Test::DBIC::ExpectedQueries",
-  "PREREQ_PM" => {
-    "Carp" => 0,
-    "DBIx::Class" => 0,
-    "Devel::StackTrace" => 0,
-    "Exporter::Tiny" => 0,
-    "Moo" => 0,
-    "Test::More" => 0,
-    "Try::Tiny" => 0,
-    "autobox::Core" => 0,
-    "autobox::Transform" => 0
-  },
-  "TEST_REQUIRES" => {
-    "Test::Deep" => 0,
-    "Test::Warnings" => 0,
-    "lib" => 0,
-    "strict" => 0,
-    "warnings" => 0
-  },
-  "VERSION" => "2.002",
-  "test" => {
-    "TESTS" => "t/*.t"
-  }
-);
-
-
-my %FallbackPrereqs = (
-  "Carp" => 0,
-  "DBIx::Class" => 0,
-  "Devel::StackTrace" => 0,
-  "Exporter::Tiny" => 0,
-  "Moo" => 0,
-  "Test::Deep" => 0,
-  "Test::More" => 0,
-  "Test::Warnings" => 0,
-  "Try::Tiny" => 0,
-  "autobox::Core" => 0,
-  "autobox::Transform" => 0,
-  "lib" => 0,
-  "strict" => 0,
-  "warnings" => 0
-);
-
-
-unless ( eval { ExtUtils::MakeMaker->VERSION(6.63_03) } ) {
-  delete $WriteMakefileArgs{TEST_REQUIRES};
-  delete $WriteMakefileArgs{BUILD_REQUIRES};
-  $WriteMakefileArgs{PREREQ_PM} = \%FallbackPrereqs;
-}
-
-delete $WriteMakefileArgs{CONFIGURE_REQUIRES}
-  unless eval { ExtUtils::MakeMaker->VERSION(6.52) };
-
-WriteMakefile(%WriteMakefileArgs);
diff --git a/README b/README
deleted file mode 100644
index c8fe6ce..0000000
--- a/README
+++ /dev/null
@@ -1,12 +0,0 @@
-This archive contains the distribution Test-DBIC-ExpectedQueries,
-version 2.002:
-
-  Test that only expected DBIx::Class queries are run
-
-This software is copyright (c) 2020 by Johan Lindstrom.
-
-This is free software; you can redistribute it and/or modify it under
-the same terms as the Perl 5 programming language system itself.
-
-
-This README file was generated by Dist::Zilla::Plugin::Readme v6.014.
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..ef576db
--- /dev/null
+++ b/README.md
@@ -0,0 +1,28 @@
+p5-Test-DBIC-ExpectedQueries
+============================
+
+## NAME
+
+Test::DBIC::ExpectedQueries - Test that no unexpected DBIx::Class
+queries are run
+
+## DESCRIPTION
+
+Ensure that only the DBIx::Class SQL queries you expect are executed
+while a particular piece of code under test is run.
+
+### Avoiding the n+1 problem
+
+When following a relation off a row object it's easy to overlook the
+fact that it's causing one query for each row in the resultset. This can
+easily be solved by prefetching those relations, but you have to know it
+happens first.
+
+This module will help you with that, and to ensure you don't
+accidentally start running many single row queries in the future.
+
+
+## Details
+
+See [Test::DBIC::ExpectedQueries](https://metacpan.org/pod/Test::DBIC::ExpectedQueries) on metacpan.org
+
diff --git a/debian/changelog b/debian/changelog
index 3a2349d..76f05fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libtest-dbic-expectedqueries-perl (2.002+git20200509.1.1ec9c28+ds-1) UNRELEASED; urgency=low
+
+  * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Sun, 04 Sep 2022 00:21:05 -0000
+
 libtest-dbic-expectedqueries-perl (2.002-2) unstable; urgency=medium
 
   * Source-only no-change re-upload.
diff --git a/source/.PerlySenseProject/.perlcritic b/source/.PerlySenseProject/.perlcritic
new file mode 100644
index 0000000..f5fd901
--- /dev/null
+++ b/source/.PerlySenseProject/.perlcritic
@@ -0,0 +1,33 @@
+#Default Perl Critic config file
+#
+#To enable Perl::Critic highlighting in your source code,
+#edit .PerlysenseProject/project.yml and set flymake/critic: 1
+#
+#Make sure you read the documentation for Perl::Critic, and especially
+#the config docs.
+#http://search.cpan.org/dist/Perl-Critic/lib/Perl/Critic.pm#CONFIGURATION
+#http://search.cpan.org/dist/Perl-Critic/lib/Perl/Critic/Config.pm
+#
+#You can obviously replace this file with your own Perl::Critic config
+#file, or a symlink to it.
+#
+
+severity  = 5
+
+theme = bugs + maintenance + security + complexity
+
+
+
+#This one must be disabled, since flymake will create temp files which
+#by definition never match the specified package name
+[-Modules::RequireFilenameMatchesPackage]
+
+[-TestingAndDebugging::RequireUseStrict]
+
+
+[-Subroutines::ProhibitSubroutinePrototypes]
+[-Subroutines::ProhibitExplicitReturnUndef]
+
+
+
+#END
diff --git a/source/.PerlySenseProject/project.yml b/source/.PerlySenseProject/project.yml
new file mode 100644
index 0000000..3302c45
--- /dev/null
+++ b/source/.PerlySenseProject/project.yml
@@ -0,0 +1,131 @@
+#PerlySense Project Config
+
+#What's this all about? See: http://search.cpan.org/dist/Devel-PerlySense/
+
+project:
+
+  #The human readable name of the Project
+  moniker: 'Test::DBIC::ExpectedQueries'
+
+  #Extra @INC directories, relative to the project root
+  #These come before the default inc directories "." and "lib"
+  inc_dir: []
+
+
+#Bookmarks are regexes that may match against a single line.
+#
+#The "rex" is either a qr regex declaration, or an array ref of
+#regexes (any of them could match to make a bookmark for the line).
+#
+#The line, or $1 if captured, is displayed.
+bookmark:
+  -
+    moniker: Todo
+    rex:
+      - "qr/\# \s* TODO \s* : \s* (.+?) \s*$/x"
+
+
+external:
+  editor:
+
+    #Emacs specific configuration
+    emacs:
+
+      #To enable flymake in Emacs, configure this in your .emacs file
+      #(setq perly-sense-load-flymake t)
+      #
+      #For more details, settings and colors, see:
+      #http://search.cpan.org/dist/Devel-PerlySense/lib/Devel/PerlySense.pm#Emacs_installation
+      #
+      flymake:
+
+        #During a flymake compilation, perly_sense can run:
+
+        #Check Syntax (perl -c)
+        #
+        #!!!NOTE!!!
+        #   Running perl -c on random Perl code will execute
+        #   the BEGIN blocks! Any funny business in them and you're toast!
+        #!!!NOTE!!!
+        syntax: 1
+
+        #Perl Critic
+        #PerlySense will point Critic to a .perlcritic file in this (the .PerlySense)
+        #directory. A default config file with fairly lenient rules is
+        #provided.
+        critic: 1
+
+
+#Run File Configuration.
+#"C-o C-r" to run "command" and "C-u C-o C-r" to run alternate_command
+#
+#These are evaluated in order to find a way to run a file. First
+#match is used.
+run_file:
+  -
+    command: "prove --nocolor -v ${INC} \"${SOURCE_FILE}\""
+    alternate_command: ""
+    moniker: Test
+    rex: \.t$
+    run_from: source_root_directory
+  -
+    command: "perl -c ${INC} \"${SOURCE_FILE}\" 2>&1| perl -ne \"/Subroutine \w+ redefined at/ or print\""
+    alternate_command: ""
+    moniker: Module
+    rex: \.pm$
+    run_from: source_root_directory
+  -
+    command: "perl ${INC} \"${SOURCE_FILE}\""
+    alternate_command: ""
+    moniker: Script
+    rex: \.pl$
+    run_from: file_directory
+
+  #This is a catch-all for all other types of files
+  -
+    command: "perl ${INC} \"${SOURCE_FILE}\""
+    alternate_command: ""
+    moniker: 'Script (no .pl)'
+    rex: .
+    run_from: file_directory
+
+
+
+#Run File in Debugger Configuration.
+#"C-o r d" to debug "command" and "C-u C-o r d" to debug alternate_command
+#
+#These are evaluated in order to find a way to debug a file. First
+#match is used.
+debug_file:
+  -
+    command: "perl -d ${INC} \"${SOURCE_FILE}\""
+    alternate_command: ""
+    moniker: Test
+    rex: \.t$
+    debug_from: source_root_directory
+  -
+    command: "perl -d ${INC} \"${SOURCE_FILE}\""
+    alternate_command: ""
+    moniker: Script
+    rex: \.pl$
+    debug_from: file_directory
+
+  -
+    command: "perl -d ${INC} \"${SOURCE_FILE}\""
+    alternate_command: ""
+    moniker: Module
+    rex: \.pm$
+    debug_from: source_root_directory
+
+  #This is a catch-all for all other types of files
+  -
+    command: "perl -d ${INC} \"${SOURCE_FILE}\""
+    alternate_command: ""
+    moniker: 'Script (no .pl)'
+    rex: .
+    debug_from: file_directory
+
+
+
+
+#EOF
diff --git a/source/.cvsignore b/source/.cvsignore
new file mode 100644
index 0000000..5da261e
--- /dev/null
+++ b/source/.cvsignore
@@ -0,0 +1,11 @@
+blib*
+Makefile
+Makefile.old
+Build
+_build*
+pm_to_blib*
+*.tar.gz
+.lwpcookies
+cover_db
+TAGS
+cover_db*
diff --git a/Changes b/source/Changes
similarity index 99%
rename from Changes
rename to source/Changes
index 9f6f5f4..ba1fb13 100644
--- a/Changes
+++ b/source/Changes
@@ -2,6 +2,8 @@
 Feature oriented Revision history for Test-DBIC-ExpectedQueries
 ===============================================================
 
+{{$NEXT}}
+
 2.002 -- 2020-05-09 13:55:33 UTC
 
 * Fix issue #6, sub-selects identifis table as "select".
diff --git a/MANIFEST.SKIP b/source/MANIFEST.SKIP
similarity index 100%
rename from MANIFEST.SKIP
rename to source/MANIFEST.SKIP
diff --git a/dist.ini b/source/dist.ini
similarity index 100%
rename from dist.ini
rename to source/dist.ini
diff --git a/lib/Test/DBIC/ExpectedQueries.pm b/source/lib/Test/DBIC/ExpectedQueries.pm
similarity index 99%
rename from lib/Test/DBIC/ExpectedQueries.pm
rename to source/lib/Test/DBIC/ExpectedQueries.pm
index 7174a5b..a369c92 100644
--- a/lib/Test/DBIC/ExpectedQueries.pm
+++ b/source/lib/Test/DBIC/ExpectedQueries.pm
@@ -353,7 +353,7 @@ queries until after they have been run.
 =cut
 
 package Test::DBIC::ExpectedQueries;
-$Test::DBIC::ExpectedQueries::VERSION = '2.002';
+
 use Moo;
 use Exporter::Tiny;
 BEGIN {extends "Exporter::Tiny"};
diff --git a/lib/Test/DBIC/ExpectedQueries/Query.pm b/source/lib/Test/DBIC/ExpectedQueries/Query.pm
similarity index 96%
rename from lib/Test/DBIC/ExpectedQueries/Query.pm
rename to source/lib/Test/DBIC/ExpectedQueries/Query.pm
index e03b480..82d19b3 100644
--- a/lib/Test/DBIC/ExpectedQueries/Query.pm
+++ b/source/lib/Test/DBIC/ExpectedQueries/Query.pm
@@ -1,5 +1,5 @@
 package Test::DBIC::ExpectedQueries::Query;
-$Test::DBIC::ExpectedQueries::Query::VERSION = '2.002';
+
 use Moo;
 
 
diff --git a/t/class.t b/source/t/class.t
similarity index 100%
rename from t/class.t
rename to source/t/class.t
diff --git a/t/queries.t b/source/t/queries.t
similarity index 100%
rename from t/queries.t
rename to source/t/queries.t
diff --git a/t/query.t b/source/t/query.t
similarity index 100%
rename from t/query.t
rename to source/t/query.t
diff --git a/t/stack_trace.t b/source/t/stack_trace.t
similarity index 100%
rename from t/stack_trace.t
rename to source/t/stack_trace.t
diff --git a/t/subroutine.t b/source/t/subroutine.t
similarity index 100%
rename from t/subroutine.t
rename to source/t/subroutine.t
diff --git a/t/author-pod-syntax.t b/t/author-pod-syntax.t
deleted file mode 100644
index 2233af0..0000000
--- a/t/author-pod-syntax.t
+++ /dev/null
@@ -1,15 +0,0 @@
-#!perl
-
-BEGIN {
-  unless ($ENV{AUTHOR_TESTING}) {
-    print qq{1..0 # SKIP these tests are for testing by the author\n};
-    exit
-  }
-}
-
-# This file was automatically generated by Dist::Zilla::Plugin::PodSyntaxTests.
-use strict; use warnings;
-use Test::More;
-use Test::Pod 1.41;
-
-all_pod_files_ok();