got things to compile again, renamed #includes

(also modified the build scripts to work with the new file structure)

164 files changed, 317 insertions, 977 deletions

diff --git a/.gitignore b/.gitignore
index 6ca496b..d7889f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 env/
+hex/
 ignore/
 old/
 *~
diff --git a/bin/build-all.sh b/bin/build-all.sh
index b3fc5d3..c5bc19a 100755
--- a/bin/build-all.sh
+++ b/bin/build-all.sh
@@ -7,16 +7,19 @@ if [ ! -z "$1" ]; then
   SEARCH="$1"
 fi
 
+# TODO: detect UI from $0
 UI=anduril
 
-date '+#define VERSION_NUMBER "%Y-%m-%d"' > version.h
+mkdir -p hex
+
+date '+#define VERSION_NUMBER "%Y-%m-%d"' > ui/$UI/version.h
 
 PASS=0
 FAIL=0
 PASSED=''
 FAILED=''
 
-for TARGET in cfg-*.h ; do
+for TARGET in hw/*/*/cfg.h ; do
 
   # maybe limit builds to a specific pattern
   if [ ! -z "$SEARCH" ]; then
@@ -25,20 +28,20 @@ for TARGET in cfg-*.h ; do
   fi
 
   # friendly name for this build
-  NAME=$(echo "$TARGET" | perl -ne '/cfg-(.*).h/ && print "$1\n";')
+  NAME=$(echo "$TARGET" | perl -ne 's|/|-|g; /hw-(.*)-cfg.h/ && print "$1\n";')
   echo "===== $NAME ====="
 
   # figure out MCU type
-  ATTINY=$(grep 'ATTINY:' $TARGET | awk '{ print $3 }')
-  if [ -z "$ATTINY" ]; then ATTINY=85 ; fi
+  #ATTINY=$(grep 'ATTINY:' $TARGET | awk '{ print $3 }')
+  #if [ -z "$ATTINY" ]; then ATTINY=85 ; fi
 
   # try to compile
-  echo ../../../bin/build.sh $ATTINY "$UI" "-DCFG_H=${TARGET}"
-  ../../../bin/build.sh $ATTINY "$UI" "-DCFG_H=${TARGET}"
+  #echo bin/build.sh "$UI" "$TARGET"
+  bin/build.sh "$UI" "$TARGET"
 
   # track result, and rename compiled files
   if [ 0 = $? ] ; then
-    mv -f "$UI".hex "$UI".$NAME.hex
+    mv -f "ui/$UI/$UI".hex hex/"$UI".$NAME.hex
     PASS=$(($PASS + 1))
     PASSED="$PASSED $NAME"
   else
diff --git a/bin/build.sh b/bin/build.sh
index 499b5bd..0c4fc17 100755
--- a/bin/build.sh
+++ b/bin/build.sh
@@ -4,13 +4,19 @@
 # same exact way, here's a script to do the same thing
 
 if [ -z "$1" ]; then
-  echo "Usage: build.sh MCU myprogram"
-  echo "MCU is a number, like '13' for attiny13 or '841' for attiny841"
+  echo "Usage: build.sh UI CFG USER"
+  echo "Example: build.sh ui/anduril hw/hank/emisar-d4 users/myuser"
+  echo "(but USER isn't implemented yet)"
   exit
 fi
 
-export ATTINY=$1 ; shift
-export PROGRAM=$1 ; shift
+UI=$1 ; shift
+CFG=$1 ; shift
+
+ATTINY=$(grep 'ATTINY:' $CFG | awk '{ print $3 }')
+if [ -z "$ATTINY" ]; then ATTINY=85 ; fi
+
+PROGRAM="ui/$UI/$UI"
 
 # give a more useful error message when AVR DFP is needed but not installed
 # (Atmel ATtiny device family pack, for attiny1616 support)
@@ -30,19 +36,23 @@ export CC=avr-gcc
 export CPP=avr-cpp
 export OBJCOPY=avr-objcopy
 export DFPFLAGS="-B $ATTINY_DFP/gcc/dev/$MCU/ -I $ATTINY_DFP/include/"
-export CFLAGS="  -Wall -g -Os -mmcu=$MCU -c -std=gnu99 -fgnu89-inline -fwhole-program -DATTINY=$ATTINY -I.. -I../.. -I../../.. -fshort-enums $DFPFLAGS"
-export CPPFLAGS="-Wall -g -Os -mmcu=$MCU -C -std=gnu99 -fgnu89-inline -fwhole-program -DATTINY=$ATTINY -I.. -I../.. -I../../.. -fshort-enums $DFPFLAGS"
+# TODO: include $user/ first so it can override other stuff
+INCLUDES="-I ui -I hw -I. -I.. -I../.. -I../../.."
+export CFLAGS="  -Wall -g -Os -mmcu=$MCU -c -std=gnu99 -fgnu89-inline -fwhole-program -DATTINY=$ATTINY $INCLUDES -fshort-enums $DFPFLAGS"
+export CPPFLAGS="-Wall -g -Os -mmcu=$MCU -C -std=gnu99 -fgnu89-inline -fwhole-program -DATTINY=$ATTINY $INCLUDES -fshort-enums $DFPFLAGS"
 export OFLAGS="-Wall -g -Os -mmcu=$MCU -mrelax $DFPFLAGS"
 export LDFLAGS="-fgnu89-inline"
 export OBJCOPYFLAGS='--set-section-flags=.eeprom=alloc,load --change-section-lma .eeprom=0 --no-change-warnings -O ihex --remove-section .fuse'
 export OBJS=$PROGRAM.o
 
+OTHERFLAGS="-DCFG_H=$CFG"
 for arg in "$*" ; do
   OTHERFLAGS="$OTHERFLAGS $arg"
 done
 
 function run () {
-  echo $*
+  #echo $1 ; shift
+  #echo $*
   $*
   if [ x"$?" != x0 ]; then exit 1 ; fi
 }
diff --git a/fsm/COPYING b/fsm/COPYING
deleted file mode 100644
index 94a9ed0..0000000
--- a/fsm/COPYING
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), 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 prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey 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;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU 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 that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  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.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-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.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            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 the public, 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
-state 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) <year>  <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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program 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, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/fsm/channels.c b/fsm/channels.c
index cc78536..92d78f5 100644
--- a/fsm/channels.c
+++ b/fsm/channels.c
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "fsm-ramping.h"
+#include "fsm/ramping.h"
 
 
 #if NUM_CHANNEL_MODES > 1
diff --git a/fsm/eeprom.c b/fsm/eeprom.c
index 66cdd78..8f8bd67 100644
--- a/fsm/eeprom.c
+++ b/fsm/eeprom.c
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "fsm-eeprom.h"
+#include "fsm/eeprom.h"
 
 #ifdef USE_EEPROM
 #ifdef EEPROM_OVERRIDE
diff --git a/fsm/main.c b/fsm/main.c
index 066188c..0524115 100644
--- a/fsm/main.c
+++ b/fsm/main.c
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "fsm-main.h"
+#include "fsm/main.h"
 
 #if PWM_CHANNELS == 4
 #ifdef AVRXMEGA3  // ATTINY816, 817, etc
diff --git a/fsm/spaghetti-monster.h b/fsm/spaghetti-monster.h
index 77431f8..e28f64a 100644
--- a/fsm/spaghetti-monster.h
+++ b/fsm/spaghetti-monster.h
@@ -19,20 +19,20 @@
 #include <avr/power.h>
 
 // include project definitions to help with recognizing symbols
-#include "fsm-events.h"
-#include "fsm-states.h"
-#include "fsm-adc.h"
-#include "fsm-wdt.h"
-#include "fsm-pcint.h"
-#include "fsm-standby.h"
-#include "fsm-channels.h"
-#include "fsm-ramping.h"
-#include "fsm-random.h"
+#include "fsm/events.h"
+#include "fsm/states.h"
+#include "fsm/adc.h"
+#include "fsm/wdt.h"
+#include "fsm/pcint.h"
+#include "fsm/standby.h"
+#include "fsm/channels.h"
+#include "fsm/ramping.h"
+#include "fsm/random.h"
 #ifdef USE_EEPROM
-#include "fsm-eeprom.h"
+#include "fsm/eeprom.h"
 #endif
-#include "fsm-misc.h"
-#include "fsm-main.h"
+#include "fsm/misc.h"
+#include "fsm/main.h"
 
 #if defined(USE_DELAY_MS) || defined(USE_DELAY_4MS) || defined(USE_DELAY_ZERO) || defined(USE_DEBUG_BLINK)
 #define OWN_DELAY
@@ -58,18 +58,18 @@ void setup();
 void loop();
 
 // include executable functions too, for easier compiling
-#include "fsm-states.c"
-#include "fsm-events.c"
-#include "fsm-adc.c"
-#include "fsm-wdt.c"
-#include "fsm-pcint.c"
-#include "fsm-standby.c"
-#include "fsm-channels.c"
-#include "fsm-ramping.c"
-#include "fsm-random.c"
+#include "fsm/states.c"
+#include "fsm/events.c"
+#include "fsm/adc.c"
+#include "fsm/wdt.c"
+#include "fsm/pcint.c"
+#include "fsm/standby.c"
+#include "fsm/channels.c"
+#include "fsm/ramping.c"
+#include "fsm/random.c"
 #ifdef USE_EEPROM
-#include "fsm-eeprom.c"
+#include "fsm/eeprom.c"
 #endif
-#include "fsm-misc.c"
-#include "fsm-main.c"
+#include "fsm/misc.c"
+#include "fsm/main.c"
 
diff --git a/fsm/standby.c b/fsm/standby.c
index 5def07c..014f2c7 100644
--- a/fsm/standby.c
+++ b/fsm/standby.c
@@ -7,9 +7,9 @@
 #include <avr/interrupt.h>
 #include <avr/sleep.h>
 
-#include "fsm-adc.h"
-#include "fsm-wdt.h"
-#include "fsm-pcint.h"
+#include "fsm/adc.h"
+#include "fsm/wdt.h"
+#include "fsm/pcint.h"
 
 // low-power standby mode used while off but power still connected
 #define standby_mode sleep_until_eswitch_pressed
diff --git a/fsm/states.c b/fsm/states.c
index 4b94ce9..760fae7 100644
--- a/fsm/states.c
+++ b/fsm/states.c
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "fsm-states.h"
-#include "fsm-adc.h"
+#include "fsm/states.h"
+#include "fsm/adc.h"
 
 // TODO: if callback doesn't handle current event,
 //       pass event to next state on stack?
diff --git a/fsm/states.h b/fsm/states.h
index 156e6cf..1e130c5 100644
--- a/fsm/states.h
+++ b/fsm/states.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "fsm-adc.h"
+#include "fsm/adc.h"
 
 // typedefs
 typedef uint8_t State(Event event, uint16_t arg);
diff --git a/hw/fireflies/e01/cfg.h b/hw/fireflies/e01/cfg.h
index 07bda87..cae5d14 100644
--- a/hw/fireflies/e01/cfg.h
+++ b/hw/fireflies/e01/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #define MODEL_NUMBER "0441"
-#include "hwdef-ff-pl47.h"
+#include "fireflies/pl47/hwdef.h"
 // ATTINY: 85
 
 // disable indicator LED; it's hardwired
diff --git a/hw/fireflies/pl47-219/cfg.h b/hw/fireflies/pl47-219/cfg.h
index 11bd5b1..e42e17c 100644
--- a/hw/fireflies/pl47-219/cfg.h
+++ b/hw/fireflies/pl47-219/cfg.h
@@ -5,7 +5,7 @@
 
 // same as PL47 but with FET modes limited to 67% power
 // to avoid destroying the LEDs
-#include "cfg-ff-pl47.h"
+#include "fireflies/pl47/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0422"
 
diff --git a/hw/fireflies/pl47/cfg.h b/hw/fireflies/pl47/cfg.h
index 6436477..315eea2 100644
--- a/hw/fireflies/pl47/cfg.h
+++ b/hw/fireflies/pl47/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #define MODEL_NUMBER "0421"
-#include "hwdef-ff-pl47.h"
+#include "fireflies/pl47/hwdef.h"
 // ATTINY: 85
 
 // the button lights up
diff --git a/hw/fireflies/pl47/hwdef.h b/hw/fireflies/pl47/hwdef.h
index 7ce7070..5eee98a 100644
--- a/hw/fireflies/pl47/hwdef.h
+++ b/hw/fireflies/pl47/hwdef.h
@@ -20,7 +20,7 @@
 #define VOLTAGE_FUDGE_FACTOR 7  // add 0.35V
 #endif
 
-#include "hwdef-emisar-d4s.h"
+#include "hank/emisar-d4s/hwdef.h"
 #undef FSM_EMISAR_D4S_DRIVER
 #undef FSM_EMISAR_D4_DRIVER
 
diff --git a/hw/fireflies/pl47g2/cfg.h b/hw/fireflies/pl47g2/cfg.h
index 830d7e8..e64289e 100644
--- a/hw/fireflies/pl47g2/cfg.h
+++ b/hw/fireflies/pl47g2/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #define MODEL_NUMBER "0423"
-#include "hwdef-ff-pl47.h"
+#include "fireflies/pl47/hwdef.h"
 // ATTINY: 85
 
 // the button lights up
diff --git a/hw/fireflies/rot66-219/cfg.h b/hw/fireflies/rot66-219/cfg.h
index 4dad4e2..068f4a8 100644
--- a/hw/fireflies/rot66-219/cfg.h
+++ b/hw/fireflies/rot66-219/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 // same as regular ROT66, but calibrated for Nichia 219B with 7x7135 chips
-#include "cfg-ff-rot66.h"
+#include "fireflies/rot66/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0412"
 
diff --git a/hw/fireflies/rot66/cfg.h b/hw/fireflies/rot66/cfg.h
index 752ddbb..5184513 100644
--- a/hw/fireflies/rot66/cfg.h
+++ b/hw/fireflies/rot66/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #define MODEL_NUMBER "0411"
-#include "hwdef-ff-rot66.h"
+#include "fireflies/rot66/hwdef.h"
 
 // the button lights up
 #define USE_INDICATOR_LED
diff --git a/hw/fireflies/rot66/hwdef.h b/hw/fireflies/rot66/hwdef.h
index 3fea9f1..dd8855d 100644
--- a/hw/fireflies/rot66/hwdef.h
+++ b/hw/fireflies/rot66/hwdef.h
@@ -15,7 +15,7 @@
 #define VOLTAGE_FUDGE_FACTOR 7  // add 0.35V
 #endif
 
-#include "hwdef-fw3a.h"
+#include "lumintop/fw3a/hwdef.h"
 
 // ... and no optic nerve
 #ifdef VISION_PIN
diff --git a/hw/fireflies/rot66g2/cfg.h b/hw/fireflies/rot66g2/cfg.h
index 04aac53..f628b51 100644
--- a/hw/fireflies/rot66g2/cfg.h
+++ b/hw/fireflies/rot66g2/cfg.h
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "cfg-ff-rot66.h"
+#include "fireflies/rot66/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0413"
 
diff --git a/hw/gchart/fet1-t1616/cfg.h b/hw/gchart/fet1-t1616/cfg.h
index 4082fca..1b5cf05 100644
--- a/hw/gchart/fet1-t1616/cfg.h
+++ b/hw/gchart/fet1-t1616/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #define MODEL_NUMBER "1618" // Golden Ratio... because I can
-#include "hwdef-gchart-fet1-t1616.h"
+#include "gchart/fet1-t1616/hwdef.h"
 // ATTINY: 1616
 
 // the button lights up
diff --git a/hw/gchart/fet1-t1616/hwdef.h b/hw/gchart/fet1-t1616/hwdef.h
index 2d2b7a6..74d8d47 100644
--- a/hw/gchart/fet1-t1616/hwdef.h
+++ b/hw/gchart/fet1-t1616/hwdef.h
@@ -16,10 +16,10 @@
 
 // nearly all t1616-based FET+1 drivers work pretty much the same
 // (this one has single-color aux like the TS10)
-#define HWDEF_C_FILE hwdef-wurkkos-ts10.c
+#define HWDEF_C_FILE wurkkos/ts10/hwdef.c
 
 // allow using aux LEDs as extra channel modes
-#include "chan-aux.h"
+#include "fsm/chan-aux.h"
 
 // channel modes:
 // * 0. FET+7135 stacked
diff --git a/hw/hank/hank-cfg.h b/hw/hank/cfg.h
index 86ac605..86ac605 100644
--- a/hw/hank/hank-cfg.h
+++ b/hw/hank/cfg.h
diff --git a/hw/hank/emisar-2ch-fet/cfg.h b/hw/hank/emisar-2ch-fet/cfg.h
index 4686483..14e8c45 100644
--- a/hw/hank/emisar-2ch-fet/cfg.h
+++ b/hw/hank/emisar-2ch-fet/cfg.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #define MODEL_NUMBER "0136"
-#include "hwdef-emisar-2ch-fet.h"
-#include "hank-cfg.h"
+#include "hank/emisar-2ch-fet/hwdef.h"
+#include "hank/cfg.h"
 // ATTINY: 1634
 
 // this light has three aux LED channels: R, G, B
diff --git a/hw/hank/emisar-2ch-fet/hwdef.c b/hw/hank/emisar-2ch-fet/hwdef.c
index caf579d..4309a42 100644
--- a/hw/hank/emisar-2ch-fet/hwdef.c
+++ b/hw/hank/emisar-2ch-fet/hwdef.c
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "chan-rgbaux.c"
+#include "fsm/chan-rgbaux.c"
 
 
 void set_level_zero();
diff --git a/hw/hank/emisar-2ch-fet/hwdef.h b/hw/hank/emisar-2ch-fet/hwdef.h
index d756a0d..a429a6c 100644
--- a/hw/hank/emisar-2ch-fet/hwdef.h
+++ b/hw/hank/emisar-2ch-fet/hwdef.h
@@ -35,10 +35,10 @@
 #define ATTINY 1634
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-emisar-2ch-fet.c
+#define HWDEF_C_FILE hank/emisar-2ch-fet/hwdef.c
 
 // allow using aux LEDs as extra channel modes
-#include "chan-rgbaux.h"
+#include "fsm/chan-rgbaux.h"
 
 // channel modes:
 // * 0. channel 1 only (linear + DD FET)
diff --git a/hw/hank/emisar-2ch/cfg.h b/hw/hank/emisar-2ch/cfg.h
index 4c3a329..da2c11c 100644
--- a/hw/hank/emisar-2ch/cfg.h
+++ b/hw/hank/emisar-2ch/cfg.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #define MODEL_NUMBER "0135"
-#include "hwdef-emisar-2ch.h"
-#include "hank-cfg.h"
+#include "hank/emisar-2ch/hwdef.h"
+#include "hank/cfg.h"
 // ATTINY: 1634
 
 // this light has three aux LED channels: R, G, B
diff --git a/hw/hank/emisar-2ch/hwdef.c b/hw/hank/emisar-2ch/hwdef.c
index b09b681..24be5ad 100644
--- a/hw/hank/emisar-2ch/hwdef.c
+++ b/hw/hank/emisar-2ch/hwdef.c
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "chan-rgbaux.c"
+#include "fsm/chan-rgbaux.c"
 
 
 void set_level_zero();
diff --git a/hw/hank/emisar-2ch/hwdef.h b/hw/hank/emisar-2ch/hwdef.h
index 99e4945..e67fac8 100644
--- a/hw/hank/emisar-2ch/hwdef.h
+++ b/hw/hank/emisar-2ch/hwdef.h
@@ -34,10 +34,10 @@
 #define ATTINY 1634
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-emisar-2ch.c
+#define HWDEF_C_FILE hank/emisar-2ch/hwdef.c
 
 // allow using aux LEDs as extra channel modes
-#include "chan-rgbaux.h"
+#include "fsm/chan-rgbaux.h"
 
 // channel modes:
 // * 0. channel 1 only
diff --git a/hw/hank/emisar-d1/cfg.h b/hw/hank/emisar-d1/cfg.h
index c81171c..6b75945 100644
--- a/hw/hank/emisar-d1/cfg.h
+++ b/hw/hank/emisar-d1/cfg.h
@@ -4,8 +4,8 @@
 #pragma once
 
 // same as Emisar D4, mostly
-#include "hwdef-emisar-d4.h"
-#include "cfg-emisar-d4.h"
+#include "hank/emisar-d4/hwdef.h"
+#include "hank/emisar-d4/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0121"
 
diff --git a/hw/hank/emisar-d18-219/cfg.h b/hw/hank/emisar-d18-219/cfg.h
index 126e9f4..97a833e 100644
--- a/hw/hank/emisar-d18-219/cfg.h
+++ b/hw/hank/emisar-d18-219/cfg.h
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "cfg-emisar-d18.h"
+#include "hank/emisar-d18/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0142"
 
diff --git a/hw/hank/emisar-d18/cfg.h b/hw/hank/emisar-d18/cfg.h
index 3e5d3ae..ff698a7 100644
--- a/hw/hank/emisar-d18/cfg.h
+++ b/hw/hank/emisar-d18/cfg.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #define MODEL_NUMBER "0141"
-#include "hwdef-emisar-d18.h"
-#include "hank-cfg.h"
+#include "hank/emisar-d18/hwdef.h"
+#include "hank/cfg.h"
 
 #define RAMP_SIZE 150
 
diff --git a/hw/hank/emisar-d18/hwdef.h b/hw/hank/emisar-d18/hwdef.h
index df08221..942c5c0 100644
--- a/hw/hank/emisar-d18/hwdef.h
+++ b/hw/hank/emisar-d18/hwdef.h
@@ -15,7 +15,7 @@
 #define ATTINY 85
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-fw3a.c
+#define HWDEF_C_FILE lumintop/fw3a/hwdef.c
 
 // channel modes
 // * 0. FET+N+1 stacked
diff --git a/hw/hank/emisar-d1s/cfg.h b/hw/hank/emisar-d1s/cfg.h
index 8b70a5d..9eddc05 100644
--- a/hw/hank/emisar-d1s/cfg.h
+++ b/hw/hank/emisar-d1s/cfg.h
@@ -4,8 +4,8 @@
 #pragma once
 
 // same as Emisar D4, mostly
-#include "hwdef-emisar-d4.h"
-#include "cfg-emisar-d4.h"
+#include "hank/emisar-d4/hwdef.h"
+#include "hank/emisar-d4/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0122"
 
diff --git a/hw/hank/emisar-d1v2-7135-fet/cfg.h b/hw/hank/emisar-d1v2-7135-fet/cfg.h
index 4022ba6..76095fe 100644
--- a/hw/hank/emisar-d1v2-7135-fet/cfg.h
+++ b/hw/hank/emisar-d1v2-7135-fet/cfg.h
@@ -6,7 +6,7 @@
 // ATTINY: 1634
 // same as Emisar D4v2, mostly
 // (was only made for a short time, not many people have one)
-#include "cfg-emisar-d4v2.h"
+#include "hank/emisar-d4v2/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0123"
 
diff --git a/hw/hank/emisar-d1v2-linear-fet/cfg.h b/hw/hank/emisar-d1v2-linear-fet/cfg.h
index 28c57f8..18217d1 100644
--- a/hw/hank/emisar-d1v2-linear-fet/cfg.h
+++ b/hw/hank/emisar-d1v2-linear-fet/cfg.h
@@ -6,7 +6,7 @@
 
 // ATTINY: 1634
 // similar to a Noctigon KR4, sort of
-#include "cfg-noctigon-kr4.h"
+#include "hank/noctigon-kr4/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0124"
 
diff --git a/hw/hank/emisar-d1v2-nofet/cfg.h b/hw/hank/emisar-d1v2-nofet/cfg.h
index 7f5bcc4..f5b1ef6 100644
--- a/hw/hank/emisar-d1v2-nofet/cfg.h
+++ b/hw/hank/emisar-d1v2-nofet/cfg.h
@@ -6,7 +6,7 @@
 
 // ATTINY: 1634
 // similar to a Noctigon KR4, sort of
-#include "cfg-noctigon-kr4-nofet.h"
+#include "hank/noctigon-kr4-nofet/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0125"
 
diff --git a/hw/hank/emisar-d4-219/cfg.h b/hw/hank/emisar-d4-219/cfg.h
index 65649e3..b26c1ab 100644
--- a/hw/hank/emisar-d4-219/cfg.h
+++ b/hw/hank/emisar-d4-219/cfg.h
@@ -5,7 +5,7 @@
 
 // same as D4 but with FET modes limited to 80% power
 // to avoid destroying the LEDs
-#include "cfg-emisar-d4.h"
+#include "hank/emisar-d4/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0112"
 
diff --git a/hw/hank/emisar-d4/cfg.h b/hw/hank/emisar-d4/cfg.h
index 4b3ae5a..b3fe836 100644
--- a/hw/hank/emisar-d4/cfg.h
+++ b/hw/hank/emisar-d4/cfg.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #define MODEL_NUMBER "0111"
-#include "hwdef-emisar-d4.h"
-#include "hank-cfg.h"
+#include "hank/emisar-d4/hwdef.h"
+#include "hank/cfg.h"
 // ATTINY: 85
 
 #define RAMP_SIZE 150
diff --git a/hw/hank/emisar-d4/hwdef.c b/hw/hank/emisar-d4/hwdef.c
index 972f682..286f95a 100644
--- a/hw/hank/emisar-d4/hwdef.c
+++ b/hw/hank/emisar-d4/hwdef.c
@@ -6,7 +6,7 @@
 
 //#ifdef AUXLED_PIN
 #if 0
-#include "chan-aux.c"
+#include "fsm/chan-aux.c"
 #else
 #define AUX_CHANNELS
 #endif
diff --git a/hw/hank/emisar-d4/hwdef.h b/hw/hank/emisar-d4/hwdef.h
index 7be700a..ffdcbfd 100644
--- a/hw/hank/emisar-d4/hwdef.h
+++ b/hw/hank/emisar-d4/hwdef.h
@@ -15,12 +15,12 @@
 #define ATTINY 85
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-emisar-d4.c
+#define HWDEF_C_FILE hank/emisar-d4/hwdef.c
 
 // allow using aux LEDs as extra channel modes (when they exist)
 //#ifdef AUXLED_PIN
 #if 0
-#include "chan-aux.h"
+#include "fsm/chan-aux.h"
 #else
 #define NUM_AUX_CHANNEL_MODES  0
 #endif
diff --git a/hw/hank/emisar-d4k-3ch/cfg.h b/hw/hank/emisar-d4k-3ch/cfg.h
index c39ac01..10aeb60 100644
--- a/hw/hank/emisar-d4k-3ch/cfg.h
+++ b/hw/hank/emisar-d4k-3ch/cfg.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #define MODEL_NUMBER "0151"
-#include "hwdef-emisar-d4k-3ch.h"
-#include "hank-cfg.h"
+#include "hank/emisar-d4k-3ch/hwdef.h"
+#include "hank/cfg.h"
 // ATTINY: 1634
 
 // this light has three aux LED channels: R, G, B
diff --git a/hw/hank/emisar-d4k-3ch/hwdef.c b/hw/hank/emisar-d4k-3ch/hwdef.c
index e35af08..ba5273d 100644
--- a/hw/hank/emisar-d4k-3ch/hwdef.c
+++ b/hw/hank/emisar-d4k-3ch/hwdef.c
@@ -3,8 +3,8 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "spaghetti-monster/anduril/channel-modes.h"  //for circular_tint_3h()
-#include "chan-rgbaux.c"
+#include "anduril/channel-modes.h"  //for circular_tint_3h()
+#include "fsm/chan-rgbaux.c"
 
 void set_level_zero();
 
diff --git a/hw/hank/emisar-d4k-3ch/hwdef.h b/hw/hank/emisar-d4k-3ch/hwdef.h
index 2e83fbe..81a64ed 100644
--- a/hw/hank/emisar-d4k-3ch/hwdef.h
+++ b/hw/hank/emisar-d4k-3ch/hwdef.h
@@ -38,10 +38,10 @@
 #define ATTINY 1634
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-emisar-d4k-3ch.c
+#define HWDEF_C_FILE hank/emisar-d4k-3ch/hwdef.c
 
 // allow using aux LEDs as extra channel modes
-#include "chan-rgbaux.h"
+#include "fsm/chan-rgbaux.h"
 
 // channel modes:
 // - 1. main 2 LEDs only (8/16/16 wiring) or LED 4 only (16/16/8)
diff --git a/hw/hank/emisar-d4s-219/cfg.h b/hw/hank/emisar-d4s-219/cfg.h
index f86c1b1..9d4fc87 100644
--- a/hw/hank/emisar-d4s-219/cfg.h
+++ b/hw/hank/emisar-d4s-219/cfg.h
@@ -5,7 +5,7 @@
 
 // same as D4S but with FET modes limited to 80% power
 // to avoid destroying the LEDs
-#include "cfg-emisar-d4s.h"
+#include "hank/emisar-d4s/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0132"
 
diff --git a/hw/hank/emisar-d4s/cfg.h b/hw/hank/emisar-d4s/cfg.h
index e966132..edfe462 100644
--- a/hw/hank/emisar-d4s/cfg.h
+++ b/hw/hank/emisar-d4s/cfg.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #define MODEL_NUMBER "0131"
-#include "hwdef-emisar-d4s.h"
-#include "hank-cfg.h"
+#include "hank/emisar-d4s/hwdef.h"
+#include "hank/cfg.h"
 // ATTINY: 85
 
 // the button lights up (on some models)
diff --git a/hw/hank/emisar-d4s/hwdef.h b/hw/hank/emisar-d4s/hwdef.h
index 95789e6..ebb93f5 100644
--- a/hw/hank/emisar-d4s/hwdef.h
+++ b/hw/hank/emisar-d4s/hwdef.h
@@ -4,7 +4,7 @@
 #pragma once
 
 // same as a D4, basically
-#include "hwdef-emisar-d4.h"
+#include "hank/emisar-d4/hwdef.h"
 
 // ... except the D4S has aux LEDs under the optic
 #ifndef AUXLED_PIN
diff --git a/hw/hank/emisar-d4sv2-219/cfg.h b/hw/hank/emisar-d4sv2-219/cfg.h
index 22775cc..4af2b37 100644
--- a/hw/hank/emisar-d4sv2-219/cfg.h
+++ b/hw/hank/emisar-d4sv2-219/cfg.h
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "cfg-emisar-d4sv2.h"
+#include "hank/emisar-d4sv2/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0134"
 // ATTINY: 1634
diff --git a/hw/hank/emisar-d4sv2/cfg.h b/hw/hank/emisar-d4sv2/cfg.h
index 666b394..8b58a0b 100644
--- a/hw/hank/emisar-d4sv2/cfg.h
+++ b/hw/hank/emisar-d4sv2/cfg.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #define MODEL_NUMBER "0133"
-#include "hwdef-emisar-d4sv2.h"
-#include "hank-cfg.h"
+#include "hank/emisar-d4sv2/hwdef.h"
+#include "hank/cfg.h"
 // ATTINY: 1634
 
 #define RAMP_SIZE 150
diff --git a/hw/hank/emisar-d4sv2/hwdef.c b/hw/hank/emisar-d4sv2/hwdef.c
index 6399fb8..36f3a8d 100644
--- a/hw/hank/emisar-d4sv2/hwdef.c
+++ b/hw/hank/emisar-d4sv2/hwdef.c
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "chan-rgbaux.c"
+#include "fsm/chan-rgbaux.c"
 
 void set_level_zero();
 
diff --git a/hw/hank/emisar-d4sv2/hwdef.h b/hw/hank/emisar-d4sv2/hwdef.h
index 11d1abb..3dae90d 100644
--- a/hw/hank/emisar-d4sv2/hwdef.h
+++ b/hw/hank/emisar-d4sv2/hwdef.h
@@ -33,10 +33,10 @@
 #define ATTINY 1634
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-emisar-d4sv2.c
+#define HWDEF_C_FILE hank/emisar-d4sv2/hwdef.c
 
 // allow using aux LEDs as extra channel modes
-#include "chan-rgbaux.h"
+#include "fsm/chan-rgbaux.h"
 
 // channel modes:
 // * 0. FET+3+1 stacked
diff --git a/hw/hank/emisar-d4v2-219/cfg.h b/hw/hank/emisar-d4v2-219/cfg.h
index e9775ec..0fb9699 100644
--- a/hw/hank/emisar-d4v2-219/cfg.h
+++ b/hw/hank/emisar-d4v2-219/cfg.h
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "cfg-emisar-d4v2.h"
+#include "hank/emisar-d4v2/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0114"
 // ATTINY: 1634
diff --git a/hw/hank/emisar-d4v2-nofet/cfg.h b/hw/hank/emisar-d4v2-nofet/cfg.h
index 6eddb40..2420f09 100644
--- a/hw/hank/emisar-d4v2-nofet/cfg.h
+++ b/hw/hank/emisar-d4v2-nofet/cfg.h
@@ -4,9 +4,9 @@
 #pragma once
 
 // switch to 1-channel support functions
-#define HWDEF_C_FILE hwdef-emisar-d4v2-nofet.c
+#define HWDEF_C_FILE hank/emisar-d4v2-nofet/hwdef.c
 
-#include "cfg-emisar-d4v2.h"
+#include "hank/emisar-d4v2/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0115"
 // ATTINY: 1634
diff --git a/hw/hank/emisar-d4v2-nofet/hwdef.c b/hw/hank/emisar-d4v2-nofet/hwdef.c
index 24477a7..971c06e 100644
--- a/hw/hank/emisar-d4v2-nofet/hwdef.c
+++ b/hw/hank/emisar-d4v2-nofet/hwdef.c
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "chan-rgbaux.c"
+#include "fsm/chan-rgbaux.c"
 
 void set_level_zero();
 
diff --git a/hw/hank/emisar-d4v2/cfg.h b/hw/hank/emisar-d4v2/cfg.h
index 0f0bb17..5cd79b5 100644
--- a/hw/hank/emisar-d4v2/cfg.h
+++ b/hw/hank/emisar-d4v2/cfg.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #define MODEL_NUMBER "0113"
-#include "hwdef-emisar-d4v2.h"
-#include "hank-cfg.h"
+#include "hank/emisar-d4v2/hwdef.h"
+#include "hank/cfg.h"
 // ATTINY: 1634
 
 #define RAMP_SIZE 150
diff --git a/hw/hank/emisar-d4v2/hwdef.c b/hw/hank/emisar-d4v2/hwdef.c
index 026b30d..b6ab081 100644
--- a/hw/hank/emisar-d4v2/hwdef.c
+++ b/hw/hank/emisar-d4v2/hwdef.c
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "chan-rgbaux.c"
+#include "fsm/chan-rgbaux.c"
 
 void set_level_zero();
 
diff --git a/hw/hank/emisar-d4v2/hwdef.h b/hw/hank/emisar-d4v2/hwdef.h
index 96c57a9..bda49bc 100644
--- a/hw/hank/emisar-d4v2/hwdef.h
+++ b/hw/hank/emisar-d4v2/hwdef.h
@@ -32,11 +32,11 @@
 #include <avr/io.h>
 
 #ifndef HWDEF_C_FILE
-#define HWDEF_C_FILE hwdef-emisar-d4v2.c
+#define HWDEF_C_FILE hank/emisar-d4v2/hwdef.c
 #endif
 
 // allow using aux LEDs as extra channel modes
-#include "chan-rgbaux.h"
+#include "fsm/chan-rgbaux.h"
 
 // channel modes:
 // * 0. FET+7135 stacked
diff --git a/hw/hank/noctigon-dm11-boost/cfg.h b/hw/hank/noctigon-dm11-boost/cfg.h
index 2174fdb..6a5a451 100644
--- a/hw/hank/noctigon-dm11-boost/cfg.h
+++ b/hw/hank/noctigon-dm11-boost/cfg.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #define MODEL_NUMBER "0273"
-#include "hwdef-noctigon-dm11-boost.h"
-#include "hank-cfg.h"
+#include "hank/noctigon-dm11-boost/hwdef.h"
+#include "hank/cfg.h"
 // ATTINY: 1634
 
 #define RAMP_SIZE 150
diff --git a/hw/hank/noctigon-dm11-boost/hwdef.c b/hw/hank/noctigon-dm11-boost/hwdef.c
index 932323a..e601132 100644
--- a/hw/hank/noctigon-dm11-boost/hwdef.c
+++ b/hw/hank/noctigon-dm11-boost/hwdef.c
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "chan-rgbaux.c"
+#include "fsm/chan-rgbaux.c"
 
 
 void set_level_zero();
diff --git a/hw/hank/noctigon-dm11-boost/hwdef.h b/hw/hank/noctigon-dm11-boost/hwdef.h
index d56a5f5..dffd462 100644
--- a/hw/hank/noctigon-dm11-boost/hwdef.h
+++ b/hw/hank/noctigon-dm11-boost/hwdef.h
@@ -39,10 +39,10 @@
 #define ATTINY 1634
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-noctigon-dm11-boost.c
+#define HWDEF_C_FILE hank/noctigon-dm11-boost/hwdef.c
 
 // allow using aux LEDs as extra channel modes
-#include "chan-rgbaux.h"
+#include "fsm/chan-rgbaux.h"
 
 // channel modes:
 // * 0. main LEDs
diff --git a/hw/hank/noctigon-dm11-nofet/cfg.h b/hw/hank/noctigon-dm11-nofet/cfg.h
index b2fdfdb..23fb40c 100644
--- a/hw/hank/noctigon-dm11-nofet/cfg.h
+++ b/hw/hank/noctigon-dm11-nofet/cfg.h
@@ -4,8 +4,8 @@
 #pragma once
 
 // same support functions as a KR4
-#define HWDEF_C_FILE hwdef-noctigon-kr4-nofet.c
-#include "cfg-noctigon-dm11.h"
+#define HWDEF_C_FILE hank/noctigon-kr4-nofet/hwdef.c
+#include "hank/noctigon-dm11/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0272"
 // ATTINY: 1634
diff --git a/hw/hank/noctigon-dm11-sbt90/cfg.h b/hw/hank/noctigon-dm11-sbt90/cfg.h
index 9fac446..802d839 100644
--- a/hw/hank/noctigon-dm11-sbt90/cfg.h
+++ b/hw/hank/noctigon-dm11-sbt90/cfg.h
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "cfg-noctigon-kr4.h"
+#include "hank/noctigon-kr4/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0274"
 // ATTINY: 1634
diff --git a/hw/hank/noctigon-dm11/cfg.h b/hw/hank/noctigon-dm11/cfg.h
index cd6bc9d..7782762 100644
--- a/hw/hank/noctigon-dm11/cfg.h
+++ b/hw/hank/noctigon-dm11/cfg.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #define MODEL_NUMBER "0271"
-#include "hwdef-noctigon-dm11.h"
-#include "hank-cfg.h"
+#include "hank/noctigon-dm11/hwdef.h"
+#include "hank/cfg.h"
 // ATTINY: 1634
 
 // this light has three aux LED channels: R, G, B
diff --git a/hw/hank/noctigon-dm11/hwdef.h b/hw/hank/noctigon-dm11/hwdef.h
index b35b27f..9ce5629 100644
--- a/hw/hank/noctigon-dm11/hwdef.h
+++ b/hw/hank/noctigon-dm11/hwdef.h
@@ -41,11 +41,11 @@
 #include <avr/io.h>
 
 #ifndef HWDEF_C_FILE
-#define HWDEF_C_FILE hwdef-noctigon-kr4.c
+#define HWDEF_C_FILE hank/noctigon-kr4/hwdef.c
 #endif
 
 // allow using aux LEDs as extra channel modes
-#include "chan-rgbaux.h"
+#include "fsm/chan-rgbaux.h"
 
 // channel modes:
 // * 0. linear + DD FET stacked
diff --git a/hw/hank/noctigon-k1-boost/cfg.h b/hw/hank/noctigon-k1-boost/cfg.h
index 0684ce7..29b20d1 100644
--- a/hw/hank/noctigon-k1-boost/cfg.h
+++ b/hw/hank/noctigon-k1-boost/cfg.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #define MODEL_NUMBER "0253"
-#include "hwdef-noctigon-k1-boost.h"
-#include "hank-cfg.h"
+#include "hank/noctigon-k1-boost/hwdef.h"
+#include "hank/cfg.h"
 // ATTINY: 1634
 
 // Most K1 lights can run hotter than default, but the 12V model
diff --git a/hw/hank/noctigon-k1-boost/hwdef.h b/hw/hank/noctigon-k1-boost/hwdef.h
index a2e693a..1c6a06d 100644
--- a/hw/hank/noctigon-k1-boost/hwdef.h
+++ b/hw/hank/noctigon-k1-boost/hwdef.h
@@ -37,10 +37,10 @@
 #define ATTINY 1634
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-noctigon-dm11-boost.c
+#define HWDEF_C_FILE hank/noctigon-dm11-boost/hwdef.c
 
 // allow using aux LEDs as extra channel modes
-#include "chan-rgbaux.h"
+#include "fsm/chan-rgbaux.h"
 
 // channel modes:
 // * 0. main LEDs
diff --git a/hw/hank/noctigon-k1-sbt90/cfg.h b/hw/hank/noctigon-k1-sbt90/cfg.h
index 568ff95..99fa2cb 100644
--- a/hw/hank/noctigon-k1-sbt90/cfg.h
+++ b/hw/hank/noctigon-k1-sbt90/cfg.h
@@ -5,8 +5,8 @@
 
 // (is a K1 host with a KR4-like driver and a really high-powered LED)
 #define MODEL_NUMBER "0252"
-#include "hwdef-noctigon-k1-sbt90.h"
-#include "hank-cfg.h"
+#include "hank/noctigon-k1-sbt90/hwdef.h"
+#include "hank/cfg.h"
 // ATTINY: 1634
 
 // this light can safely run a bit hotter than most
diff --git a/hw/hank/noctigon-k1-sbt90/hwdef.h b/hw/hank/noctigon-k1-sbt90/hwdef.h
index c89c3fc..bdea32d 100644
--- a/hw/hank/noctigon-k1-sbt90/hwdef.h
+++ b/hw/hank/noctigon-k1-sbt90/hwdef.h
@@ -40,10 +40,10 @@
 #define ATTINY 1634
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-noctigon-kr4.c
+#define HWDEF_C_FILE hank/noctigon-kr4/hwdef.c
 
 // allow using aux LEDs as extra channel modes
-#include "chan-rgbaux.h"
+#include "fsm/chan-rgbaux.h"
 
 // channel modes:
 // * 0. linear + DD FET stacked
diff --git a/hw/hank/noctigon-k1/cfg.h b/hw/hank/noctigon-k1/cfg.h
index b2d4697..f02e4ef 100644
--- a/hw/hank/noctigon-k1/cfg.h
+++ b/hw/hank/noctigon-k1/cfg.h
@@ -5,8 +5,8 @@
 
 #define MODEL_NUMBER "0251"
 // (originally known as Emisar D1S v2)
-#include "hwdef-noctigon-k1.h"
-#include "hank-cfg.h"
+#include "hank/noctigon-k1/hwdef.h"
+#include "hank/cfg.h"
 // ATTINY: 1634
 
 // this light can safely run a bit hotter than most
diff --git a/hw/hank/noctigon-k1/hwdef.c b/hw/hank/noctigon-k1/hwdef.c
index 5d61860..f2c4069 100644
--- a/hw/hank/noctigon-k1/hwdef.c
+++ b/hw/hank/noctigon-k1/hwdef.c
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "chan-rgbaux.c"
+#include "fsm/chan-rgbaux.c"
 
 void set_level_zero();
 
diff --git a/hw/hank/noctigon-k1/hwdef.h b/hw/hank/noctigon-k1/hwdef.h
index 6467567..f6e714d 100644
--- a/hw/hank/noctigon-k1/hwdef.h
+++ b/hw/hank/noctigon-k1/hwdef.h
@@ -40,11 +40,11 @@
 #include <avr/io.h>
 
 #ifndef HWDEF_C_FILE
-#define HWDEF_C_FILE hwdef-noctigon-k1.c
+#define HWDEF_C_FILE hank/noctigon-k1/hwdef.c
 #endif
 
 // allow using aux LEDs as extra channel modes
-#include "chan-rgbaux.h"
+#include "fsm/chan-rgbaux.h"
 
 // channel modes:
 // * 0. main LED
diff --git a/hw/hank/noctigon-k9.3-219/cfg.h b/hw/hank/noctigon-k9.3-219/cfg.h
index 88abf05..deb2f5b 100644
--- a/hw/hank/noctigon-k9.3-219/cfg.h
+++ b/hw/hank/noctigon-k9.3-219/cfg.h
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "cfg-noctigon-k9.3.h"
+#include "hank/noctigon-k9.3/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0263"
 // ATTINY: 1634
diff --git a/hw/hank/noctigon-k9.3-nofet/cfg.h b/hw/hank/noctigon-k9.3-nofet/cfg.h
index 16504fd..ab54133 100644
--- a/hw/hank/noctigon-k9.3-nofet/cfg.h
+++ b/hw/hank/noctigon-k9.3-nofet/cfg.h
@@ -5,7 +5,7 @@
 
 // no functional differences from generic emisar-2ch build
 // (just use that one instead, this is only here for legacy reasons)
-#include "cfg-emisar-2ch.h"
+#include "hank/emisar-2ch/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0262"
 // ATTINY: 1634
diff --git a/hw/hank/noctigon-k9.3/cfg.h b/hw/hank/noctigon-k9.3/cfg.h
index ba24504..bf5d29a 100644
--- a/hw/hank/noctigon-k9.3/cfg.h
+++ b/hw/hank/noctigon-k9.3/cfg.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #define MODEL_NUMBER "0261"
-#include "hwdef-emisar-2ch-fet.h"
-#include "hank-cfg.h"
+#include "hank/emisar-2ch-fet/hwdef.h"
+#include "hank/cfg.h"
 // ATTINY: 1634
 
 // this light has three aux LED channels: R, G, B
diff --git a/hw/hank/noctigon-kr4-219/cfg.h b/hw/hank/noctigon-kr4-219/cfg.h
index 5d106ef..8b566f3 100644
--- a/hw/hank/noctigon-kr4-219/cfg.h
+++ b/hw/hank/noctigon-kr4-219/cfg.h
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "cfg-noctigon-kr4.h"
+#include "hank/noctigon-kr4/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0213"
 // ATTINY: 1634
diff --git a/hw/hank/noctigon-kr4-219b/cfg.h b/hw/hank/noctigon-kr4-219b/cfg.h
index b242048..99b6924 100644
--- a/hw/hank/noctigon-kr4-219b/cfg.h
+++ b/hw/hank/noctigon-kr4-219b/cfg.h
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "cfg-noctigon-kr4.h"
+#include "hank/noctigon-kr4/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0214"
 // ATTINY: 1634
diff --git a/hw/hank/noctigon-kr4-2ch/cfg.h b/hw/hank/noctigon-kr4-2ch/cfg.h
index 09dd604..d2f41f8 100644
--- a/hw/hank/noctigon-kr4-2ch/cfg.h
+++ b/hw/hank/noctigon-kr4-2ch/cfg.h
@@ -6,8 +6,8 @@
 // (basically the same as Emisar generic 2-channel build,
 // but switch on a different pin, and no lighted button)
 // ATTINY: 1634
-#include "hwdef-noctigon-kr4-2ch.h"
-#include "cfg-emisar-2ch.h"
+#include "hank/noctigon-kr4-2ch/hwdef.h"
+#include "hank/emisar-2ch/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0215"
 
diff --git a/hw/hank/noctigon-kr4-2ch/hwdef.h b/hw/hank/noctigon-kr4-2ch/hwdef.h
index a450693..081fccc 100644
--- a/hw/hank/noctigon-kr4-2ch/hwdef.h
+++ b/hw/hank/noctigon-kr4-2ch/hwdef.h
@@ -43,5 +43,5 @@
 #define PCINT_vect   PCINT1_vect  // ISR for PCINT[11:8]
 
 // the rest of the config is the same as the generic Emisar 2ch build
-#include "hwdef-emisar-2ch.h"
+#include "hank/emisar-2ch/hwdef.h"
 
diff --git a/hw/hank/noctigon-kr4-boost/cfg.h b/hw/hank/noctigon-kr4-boost/cfg.h
index 1603acf..3dd2283 100644
--- a/hw/hank/noctigon-kr4-boost/cfg.h
+++ b/hw/hank/noctigon-kr4-boost/cfg.h
@@ -7,10 +7,10 @@
 // the only things different from dm11-boost are:
 // - e-switch is on a different pin (defined in hwdef)
 // - different model number
-#include "cfg-noctigon-dm11-boost.h"
-#include "hwdef-noctigon-kr4-boost.h"
+#include "hank/noctigon-dm11-boost/cfg.h"
+#include "hank/noctigon-kr4-boost/hwdef.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0216"
-#include "hank-cfg.h"
+#include "hank/cfg.h"
 // ATTINY: 1634
 
diff --git a/hw/hank/noctigon-kr4-boost/hwdef.h b/hw/hank/noctigon-kr4-boost/hwdef.h
index 07c4f4b..1ee2627 100644
--- a/hw/hank/noctigon-kr4-boost/hwdef.h
+++ b/hw/hank/noctigon-kr4-boost/hwdef.h
@@ -37,7 +37,7 @@
  * not to change brightness.
  */
 
-#include "hwdef-noctigon-dm11-boost.h"
+#include "hank/noctigon-dm11-boost/hwdef.h"
 
 // e-switch is on a different pin
 #undef SWITCH_PIN
diff --git a/hw/hank/noctigon-kr4-nofet/cfg.h b/hw/hank/noctigon-kr4-nofet/cfg.h
index 6d49a8b..cc9e7e0 100644
--- a/hw/hank/noctigon-kr4-nofet/cfg.h
+++ b/hw/hank/noctigon-kr4-nofet/cfg.h
@@ -5,8 +5,8 @@
 
 // (and Noctigon KR1)
 // (and Emisar D4v2 E21A, a.k.a. "D4v2.5")
-#define HWDEF_C_FILE hwdef-noctigon-kr4-nofet.c
-#include "cfg-noctigon-kr4.h"
+#define HWDEF_C_FILE hank/noctigon-kr4-nofet/hwdef.c
+#include "hank/noctigon-kr4/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0212"
 // ATTINY: 1634
diff --git a/hw/hank/noctigon-kr4-nofet/hwdef.c b/hw/hank/noctigon-kr4-nofet/hwdef.c
index 0492def..783eeed 100644
--- a/hw/hank/noctigon-kr4-nofet/hwdef.c
+++ b/hw/hank/noctigon-kr4-nofet/hwdef.c
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "chan-rgbaux.c"
+#include "fsm/chan-rgbaux.c"
 
 void set_level_zero();
 
diff --git a/hw/hank/noctigon-kr4/cfg.h b/hw/hank/noctigon-kr4/cfg.h
index 5b24ef5..8a12b1f 100644
--- a/hw/hank/noctigon-kr4/cfg.h
+++ b/hw/hank/noctigon-kr4/cfg.h
@@ -5,8 +5,8 @@
 #pragma once
 
 #define MODEL_NUMBER "0211"
-#include "hwdef-noctigon-kr4.h"
-#include "hank-cfg.h"
+#include "hank/noctigon-kr4/hwdef.h"
+#include "hank/cfg.h"
 // ATTINY: 1634
 
 // brightness w/ SST-20 4000K LEDs:
diff --git a/hw/hank/noctigon-kr4/hwdef.c b/hw/hank/noctigon-kr4/hwdef.c
index 884151d..6e6435d 100644
--- a/hw/hank/noctigon-kr4/hwdef.c
+++ b/hw/hank/noctigon-kr4/hwdef.c
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "chan-rgbaux.c"
+#include "fsm/chan-rgbaux.c"
 
 void set_level_zero();
 
diff --git a/hw/hank/noctigon-kr4/hwdef.h b/hw/hank/noctigon-kr4/hwdef.h
index 5570fb7..a830910 100644
--- a/hw/hank/noctigon-kr4/hwdef.h
+++ b/hw/hank/noctigon-kr4/hwdef.h
@@ -39,11 +39,11 @@
 #include <avr/io.h>
 
 #ifndef HWDEF_C_FILE
-#define HWDEF_C_FILE hwdef-noctigon-kr4.c
+#define HWDEF_C_FILE hank/noctigon-kr4/hwdef.c
 #endif
 
 // allow using aux LEDs as extra channel modes
-#include "chan-rgbaux.h"
+#include "fsm/chan-rgbaux.h"
 
 // channel modes:
 // * 0. linear + DD FET stacked
diff --git a/hw/hank/noctigon-m44/cfg.h b/hw/hank/noctigon-m44/cfg.h
index 88bf628..3e80f66 100644
--- a/hw/hank/noctigon-m44/cfg.h
+++ b/hw/hank/noctigon-m44/cfg.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #define MODEL_NUMBER "0143"
-#include "hwdef-noctigon-m44.h"
-#include "hank-cfg.h"
+#include "hank/noctigon-m44/hwdef.h"
+#include "hank/cfg.h"
 // ATTINY: 1634
 
 // this light has three aux LED channels: R, G, B
diff --git a/hw/hank/noctigon-m44/hwdef.c b/hw/hank/noctigon-m44/hwdef.c
index 395a7a2..c7e1435 100644
--- a/hw/hank/noctigon-m44/hwdef.c
+++ b/hw/hank/noctigon-m44/hwdef.c
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "chan-rgbaux.c"
+#include "fsm/chan-rgbaux.c"
 
 
 void set_level_zero();
diff --git a/hw/hank/noctigon-m44/hwdef.h b/hw/hank/noctigon-m44/hwdef.h
index 5658c9f..7bacfd1 100644
--- a/hw/hank/noctigon-m44/hwdef.h
+++ b/hw/hank/noctigon-m44/hwdef.h
@@ -31,10 +31,10 @@
 #define ATTINY 1634
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-noctigon-m44.c
+#define HWDEF_C_FILE hank/noctigon-m44/hwdef.c
 
 // allow using aux LEDs as extra channel modes
-#include "chan-rgbaux.h"
+#include "fsm/chan-rgbaux.h"
 
 // channel modes:
 // * 0. channel 1 only
diff --git a/hw/lumintop/blf-gt-mini/cfg.h b/hw/lumintop/blf-gt-mini/cfg.h
index 083f18e..1e913a9 100644
--- a/hw/lumintop/blf-gt-mini/cfg.h
+++ b/hw/lumintop/blf-gt-mini/cfg.h
@@ -3,9 +3,9 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "hwdef-blf-gt-mini.h"
+#include "lumintop/blf-gt-mini/hwdef.h"
 // Same as an Emisar D1S, except it has a lighted button
-#include "cfg-emisar-d1s.h"
+#include "hank/emisar-d1s/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0322"
 
diff --git a/hw/lumintop/blf-gt-mini/hwdef.h b/hw/lumintop/blf-gt-mini/hwdef.h
index f4a4d7b..844abfe 100644
--- a/hw/lumintop/blf-gt-mini/hwdef.h
+++ b/hw/lumintop/blf-gt-mini/hwdef.h
@@ -5,7 +5,7 @@
 
 // exactly the same as a D1S, but with a lighted button
 // (which is the same hwdef as a D4)
-#include "hwdef-emisar-d4.h"
+#include "hank/emisar-d4/hwdef.h"
 
 // lighted button
 #ifndef AUXLED_PIN
diff --git a/hw/lumintop/blf-gt/cfg.h b/hw/lumintop/blf-gt/cfg.h
index 580318a..d06b1fa 100644
--- a/hw/lumintop/blf-gt/cfg.h
+++ b/hw/lumintop/blf-gt/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #define MODEL_NUMBER "0321"
-#include "hwdef-blf-gt.h"
+#include "lumintop/blf-gt/hwdef.h"
 // ATTINY: 85
 
 // the button lights up
diff --git a/hw/lumintop/blf-gt/hwdef.h b/hw/lumintop/blf-gt/hwdef.h
index fdb0cb6..bd23086 100644
--- a/hw/lumintop/blf-gt/hwdef.h
+++ b/hw/lumintop/blf-gt/hwdef.h
@@ -19,7 +19,7 @@
 #define ATTINY 85
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-emisar-d4.c
+#define HWDEF_C_FILE hank/emisar-d4/hwdef.c
 
 // channel modes
 // * 0. main LEDs
diff --git a/hw/lumintop/fw3a-219/cfg.h b/hw/lumintop/fw3a-219/cfg.h
index 0bd5250..32cc020 100644
--- a/hw/lumintop/fw3a-219/cfg.h
+++ b/hw/lumintop/fw3a-219/cfg.h
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "cfg-fw3a.h"
+#include "lumintop/fw3a/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0312"
 
diff --git a/hw/lumintop/fw3a-nofet/cfg.h b/hw/lumintop/fw3a-nofet/cfg.h
index b5d4166..76f125b 100644
--- a/hw/lumintop/fw3a-nofet/cfg.h
+++ b/hw/lumintop/fw3a-nofet/cfg.h
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "cfg-fw3a.h"
+#include "lumintop/fw3a/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0313"
 
diff --git a/hw/lumintop/fw3a/cfg.h b/hw/lumintop/fw3a/cfg.h
index 53c4135..123a7e1 100644
--- a/hw/lumintop/fw3a/cfg.h
+++ b/hw/lumintop/fw3a/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #define MODEL_NUMBER "0311"
-#include "hwdef-fw3a.h"
+#include "lumintop/fw3a/hwdef.h"
 
 #define RAMP_SIZE 150
 
diff --git a/hw/lumintop/fw3a/hwdef.h b/hw/lumintop/fw3a/hwdef.h
index 519fb97..fc9ff2a 100644
--- a/hw/lumintop/fw3a/hwdef.h
+++ b/hw/lumintop/fw3a/hwdef.h
@@ -15,7 +15,7 @@
 #define ATTINY 85
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-fw3a.c
+#define HWDEF_C_FILE lumintop/fw3a/hwdef.c
 
 // channel modes
 // * 0. FET+7+1 stacked
diff --git a/hw/lumintop/fw3x-lume1/cfg.h b/hw/lumintop/fw3x-lume1/cfg.h
index 184ab8e..2ea540c 100644
--- a/hw/lumintop/fw3x-lume1/cfg.h
+++ b/hw/lumintop/fw3x-lume1/cfg.h
@@ -12,7 +12,7 @@
  */
 
 #define MODEL_NUMBER "0314"
-#include "hwdef-fw3x-lume1.h"
+#include "lumintop/fw3x-lume1/hwdef.h"
 // ATTINY: 1634
 
 // set this light for 50C thermal ceiling
diff --git a/hw/lumintop/fw3x-lume1/hwdef.c b/hw/lumintop/fw3x-lume1/hwdef.c
index 2f31ed0..71cd799 100644
--- a/hw/lumintop/fw3x-lume1/hwdef.c
+++ b/hw/lumintop/fw3x-lume1/hwdef.c
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "chan-rgbaux.c"
+#include "fsm/chan-rgbaux.c"
 
 void set_level_zero();
 
diff --git a/hw/lumintop/fw3x-lume1/hwdef.h b/hw/lumintop/fw3x-lume1/hwdef.h
index c03248b..8c673b3 100644
--- a/hw/lumintop/fw3x-lume1/hwdef.h
+++ b/hw/lumintop/fw3x-lume1/hwdef.h
@@ -37,10 +37,10 @@
 #define ATTINY 1634
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-fw3x-lume1.c
+#define HWDEF_C_FILE lumintop/fw3x-lume1/hwdef.c
 
 // allow using aux LEDs as extra channel modes
-#include "chan-rgbaux.h"
+#include "fsm/chan-rgbaux.h"
 
 // channel modes:
 // * 0. main LEDs
diff --git a/hw/mateminco/mf01-mini/cfg.h b/hw/mateminco/mf01-mini/cfg.h
index fb62ac6..a9e4816 100644
--- a/hw/mateminco/mf01-mini/cfg.h
+++ b/hw/mateminco/mf01-mini/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #define MODEL_NUMBER "0521"
-#include "hwdef-mateminco-mf01-mini.h"
+#include "mateminco/mf01-mini/hwdef.h"
 
 // the button lights up
 #define USE_INDICATOR_LED
diff --git a/hw/mateminco/mf01-mini/hwdef.h b/hw/mateminco/mf01-mini/hwdef.h
index 35405db..663e1d2 100644
--- a/hw/mateminco/mf01-mini/hwdef.h
+++ b/hw/mateminco/mf01-mini/hwdef.h
@@ -15,7 +15,7 @@
 #define ATTINY 85
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-fw3a.c
+#define HWDEF_C_FILE lumintop/fw3a/hwdef.c
 
 // channel modes
 // * 0. FET+N+1 stacked
diff --git a/hw/mateminco/mf01s/cfg.h b/hw/mateminco/mf01s/cfg.h
index de92693..573c71d 100644
--- a/hw/mateminco/mf01s/cfg.h
+++ b/hw/mateminco/mf01s/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #define MODEL_NUMBER "0511"
-#include "hwdef-mateminco-mf01s.h"
+#include "mateminco/mf01s/hwdef.h"
 // ATTINY: 85
 
 // the button lights up
diff --git a/hw/mateminco/mf01s/hwdef.h b/hw/mateminco/mf01s/hwdef.h
index af214b2..3d88975 100644
--- a/hw/mateminco/mf01s/hwdef.h
+++ b/hw/mateminco/mf01s/hwdef.h
@@ -15,7 +15,7 @@
 #define ATTINY 85
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-emisar-d4.c
+#define HWDEF_C_FILE hank/emisar-d4/hwdef.c
 
 // channel modes
 // * 0. small FET + big FET stacked
diff --git a/hw/mateminco/mt35-mini/cfg.h b/hw/mateminco/mt35-mini/cfg.h
index 1ca5008..506f851 100644
--- a/hw/mateminco/mt35-mini/cfg.h
+++ b/hw/mateminco/mt35-mini/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #define MODEL_NUMBER "0531"
-#include "hwdef-mateminco-mt35-mini.h"
+#include "mateminco/mt35-mini/hwdef.h"
 // ATTINY: 85
 
 // the button lights up
diff --git a/hw/mateminco/mt35-mini/hwdef.h b/hw/mateminco/mt35-mini/hwdef.h
index 015c813..c27f910 100644
--- a/hw/mateminco/mt35-mini/hwdef.h
+++ b/hw/mateminco/mt35-mini/hwdef.h
@@ -15,7 +15,7 @@
 #define ATTINY 85
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-emisar-d4.c
+#define HWDEF_C_FILE hank/emisar-d4/hwdef.c
 
 // channel modes
 // * 0. FET+7135 stacked
diff --git a/hw/sofirn/blf-lt1-t1616/cfg.h b/hw/sofirn/blf-lt1-t1616/cfg.h
index fc02619..eea5ef5 100644
--- a/hw/sofirn/blf-lt1-t1616/cfg.h
+++ b/hw/sofirn/blf-lt1-t1616/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #define MODEL_NUMBER "0622"
-#include "hwdef-blf-lt1-t1616.h"
+#include "sofirn/blf-lt1-t1616/hwdef.h"
 // ATTINY: 1616
 
 // the button lights up
diff --git a/hw/sofirn/blf-lt1-t1616/hwdef.c b/hw/sofirn/blf-lt1-t1616/hwdef.c
index 9d268a4..5a83849 100644
--- a/hw/sofirn/blf-lt1-t1616/hwdef.c
+++ b/hw/sofirn/blf-lt1-t1616/hwdef.c
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "chan-aux.c"
+#include "fsm/chan-aux.c"
 
 
 void set_level_zero();
diff --git a/hw/sofirn/blf-lt1-t1616/hwdef.h b/hw/sofirn/blf-lt1-t1616/hwdef.h
index 7c1f10b..203cdc8 100644
--- a/hw/sofirn/blf-lt1-t1616/hwdef.h
+++ b/hw/sofirn/blf-lt1-t1616/hwdef.h
@@ -15,10 +15,10 @@
 #define ATTINY 1616
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-blf-lt1-t1616.c
+#define HWDEF_C_FILE sofirn/blf-lt1-t1616/hwdef.c
 
 // allow using aux LEDs as extra channel modes
-#include "chan-aux.h"
+#include "fsm/chan-aux.h"
 
 // channel modes:
 // * 0. warm only
diff --git a/hw/sofirn/blf-lt1/cfg.h b/hw/sofirn/blf-lt1/cfg.h
index 53c3203..e60c9f7 100644
--- a/hw/sofirn/blf-lt1/cfg.h
+++ b/hw/sofirn/blf-lt1/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #define MODEL_NUMBER "0621"
-#include "hwdef-blf-lt1.h"
+#include "sofirn/blf-lt1/hwdef.h"
 // ATTINY: 85
 
 // the button lights up
diff --git a/hw/sofirn/blf-lt1/hwdef.h b/hw/sofirn/blf-lt1/hwdef.h
index b113fd4..192d067 100644
--- a/hw/sofirn/blf-lt1/hwdef.h
+++ b/hw/sofirn/blf-lt1/hwdef.h
@@ -15,7 +15,7 @@
 #define ATTINY 85
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-blf-lt1.c
+#define HWDEF_C_FILE sofirn/blf-lt1/hwdef.c
 
 // channel modes:
 // * 0. channel 1 only
diff --git a/hw/sofirn/blf-q8-t1616/cfg.h b/hw/sofirn/blf-q8-t1616/cfg.h
index 9f0402c..dca3aa8 100644
--- a/hw/sofirn/blf-q8-t1616/cfg.h
+++ b/hw/sofirn/blf-q8-t1616/cfg.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #define MODEL_NUMBER "0613"
-#include "hwdef-blf-q8-t1616.h"
-#include "wurkkos-cfg.h"  // Sofirn lights are closely related to Wurkkos
+#include "sofirn/blf-q8-t1616/hwdef.h"
+#include "wurkkos/cfg.h"  // Sofirn lights are closely related to Wurkkos
 // ATTINY: 1616
 
 // the button lights up
diff --git a/hw/sofirn/blf-q8-t1616/hwdef.h b/hw/sofirn/blf-q8-t1616/hwdef.h
index d9b981f..9098022 100644
--- a/hw/sofirn/blf-q8-t1616/hwdef.h
+++ b/hw/sofirn/blf-q8-t1616/hwdef.h
@@ -20,10 +20,10 @@
 
 // nearly all t1616-based FET+1 drivers work pretty much the same
 // (this one has single-color aux like the TS10)
-#define HWDEF_C_FILE hwdef-wurkkos-ts10.c
+#define HWDEF_C_FILE wurkkos/ts10/hwdef.c
 
 // allow using aux LEDs as extra channel modes
-#include "chan-aux.h"
+#include "fsm/chan-aux.h"
 
 // channel modes:
 // * 0. FET+7135 stacked
diff --git a/hw/sofirn/blf-q8/cfg.h b/hw/sofirn/blf-q8/cfg.h
index 29dbcb7..622d885 100644
--- a/hw/sofirn/blf-q8/cfg.h
+++ b/hw/sofirn/blf-q8/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #define MODEL_NUMBER "0611"
-#include "hwdef-blf-q8.h"
+#include "sofirn/blf-q8/hwdef.h"
 
 #define RAMP_SIZE 150
 
diff --git a/hw/sofirn/blf-q8/hwdef.h b/hw/sofirn/blf-q8/hwdef.h
index cdf311d..8549170 100644
--- a/hw/sofirn/blf-q8/hwdef.h
+++ b/hw/sofirn/blf-q8/hwdef.h
@@ -16,5 +16,5 @@
 #endif
 
 // Q8 driver is the same as a D4, basically
-#include "hwdef-emisar-d4.h"
+#include "hank/emisar-d4/hwdef.h"
 
diff --git a/hw/sofirn/lt1s-pro/cfg.h b/hw/sofirn/lt1s-pro/cfg.h
index 440a03d..c6a0f3e 100644
--- a/hw/sofirn/lt1s-pro/cfg.h
+++ b/hw/sofirn/lt1s-pro/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #define MODEL_NUMBER "0623"
-#include "hwdef-sofirn-lt1s-pro.h"
+#include "sofirn/lt1s-pro/hwdef.h"
 // ATTINY: 1616
 
 // off mode: low (1)
diff --git a/hw/sofirn/lt1s-pro/hwdef.h b/hw/sofirn/lt1s-pro/hwdef.h
index ae6b3bf..4179c67 100644
--- a/hw/sofirn/lt1s-pro/hwdef.h
+++ b/hw/sofirn/lt1s-pro/hwdef.h
@@ -16,7 +16,7 @@
 #define ATTINY 1616
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-sofirn-lt1s-pro.c
+#define HWDEF_C_FILE sofirn/lt1s-pro/hwdef.c
 
 // channel modes:
 // * 0. warm/cool white blend
diff --git a/hw/sofirn/sc21-pro/cfg.h b/hw/sofirn/sc21-pro/cfg.h
index 8fd2dee..febd1dd 100644
--- a/hw/sofirn/sc21-pro/cfg.h
+++ b/hw/sofirn/sc21-pro/cfg.h
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "cfg-wurkkos-ts10.h"
+#include "wurkkos/ts10/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0632"
 // ATTINY: 1616
diff --git a/hw/sofirn/sp10-pro/cfg.h b/hw/sofirn/sp10-pro/cfg.h
index 0e2f28d..e265918 100644
--- a/hw/sofirn/sp10-pro/cfg.h
+++ b/hw/sofirn/sp10-pro/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #define MODEL_NUMBER "0631"
-#include "hwdef-sofirn-sp10-pro.h"
+#include "sofirn/sp10-pro/hwdef.h"
 // ATTINY: 1616
 
 // 1....15: level_calc.py 3.01 1  15 7135 1 0.1   2 --pwm dyn:15:64:64
diff --git a/hw/sofirn/sp10-pro/hwdef.h b/hw/sofirn/sp10-pro/hwdef.h
index 5cef6a7..1d1ec25 100644
--- a/hw/sofirn/sp10-pro/hwdef.h
+++ b/hw/sofirn/sp10-pro/hwdef.h
@@ -15,7 +15,7 @@
 #define ATTINY 1616
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-sofirn-sp10-pro.c
+#define HWDEF_C_FILE sofirn/sp10-pro/hwdef.c
 
 // channel modes:
 // * 0. low+high PWM stacked
diff --git a/hw/sofirn/sp36-t1616/cfg.h b/hw/sofirn/sp36-t1616/cfg.h
index cb29e4f..d3e5459 100644
--- a/hw/sofirn/sp36-t1616/cfg.h
+++ b/hw/sofirn/sp36-t1616/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 // same as  the  BLF Q8, mostly
-#include "cfg-blf-q8-t1616.h"
+#include "sofirn/blf-q8-t1616/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0614"
 // ATTINY: 1616
diff --git a/hw/sofirn/sp36/cfg.h b/hw/sofirn/sp36/cfg.h
index 3661686..7b65ad9 100644
--- a/hw/sofirn/sp36/cfg.h
+++ b/hw/sofirn/sp36/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 // same as  the  BLF Q8, mostly
-#include "cfg-blf-q8.h"
+#include "sofirn/blf-q8/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0612"
 
diff --git a/hw/thefreeman/boost-fwaa-mp3432-hdr-dac-rgb/cfg.h b/hw/thefreeman/boost-fwaa-mp3432-hdr-dac-rgb/cfg.h
index 460346e..e30a218 100644
--- a/hw/thefreeman/boost-fwaa-mp3432-hdr-dac-rgb/cfg.h
+++ b/hw/thefreeman/boost-fwaa-mp3432-hdr-dac-rgb/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #define MODEL_NUMBER "1632"
-#include "hwdef-thefreeman-boost-fwaa-mp3432-hdr-dac-rgb.h"
+#include "thefreeman/boost-fwaa-mp3432-hdr-dac-rgb/hwdef.h"
 // ATTINY: 1616
 
 // HPRsense : 4.2+0.3+20 = 24.5mR (DMN1004UFDF+trace resistance+20mR)
diff --git a/hw/thefreeman/boost-fwaa-mp3432-hdr-dac-rgb/hwdef.h b/hw/thefreeman/boost-fwaa-mp3432-hdr-dac-rgb/hwdef.h
index 9126a1a..91fca72 100644
--- a/hw/thefreeman/boost-fwaa-mp3432-hdr-dac-rgb/hwdef.h
+++ b/hw/thefreeman/boost-fwaa-mp3432-hdr-dac-rgb/hwdef.h
@@ -39,10 +39,10 @@
 #define ATTINY 1616
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-thefreeman-boost21-mp3431-hdr-dac-argb.c
+#define HWDEF_C_FILE thefreeman/boost21-mp3431-hdr-dac-argb/hwdef.c
 
 // allow using aux LEDs as extra channel modes
-#include "chan-rgbaux.h"
+#include "fsm/chan-rgbaux.h"
 
 // channel modes:
 // * 0. main LEDs
diff --git a/hw/thefreeman/boost21-mp3431-hdr-dac-argb/cfg.h b/hw/thefreeman/boost21-mp3431-hdr-dac-argb/cfg.h
index 66cc2d0..2ed8fae 100644
--- a/hw/thefreeman/boost21-mp3431-hdr-dac-argb/cfg.h
+++ b/hw/thefreeman/boost21-mp3431-hdr-dac-argb/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #define MODEL_NUMBER "1631"
-#include "hwdef-thefreeman-boost21-mp3431-hdr-dac-argb.h"
+#include "thefreeman/boost21-mp3431-hdr-dac-argb/hwdef.h"
 // ATTINY: 1616
 
 // HPRsense : 1.7+0.3+5 = 7mR (DMN22M5UFG+trace resistance+5mR)
diff --git a/hw/thefreeman/boost21-mp3431-hdr-dac-argb/hwdef.c b/hw/thefreeman/boost21-mp3431-hdr-dac-argb/hwdef.c
index 31feec9..97f5fc9 100644
--- a/hw/thefreeman/boost21-mp3431-hdr-dac-argb/hwdef.c
+++ b/hw/thefreeman/boost21-mp3431-hdr-dac-argb/hwdef.c
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "chan-rgbaux.c"
+#include "fsm/chan-rgbaux.c"
 
 void set_level_zero();
 
diff --git a/hw/thefreeman/boost21-mp3431-hdr-dac-argb/hwdef.h b/hw/thefreeman/boost21-mp3431-hdr-dac-argb/hwdef.h
index 1c35014..1ca4a14 100644
--- a/hw/thefreeman/boost21-mp3431-hdr-dac-argb/hwdef.h
+++ b/hw/thefreeman/boost21-mp3431-hdr-dac-argb/hwdef.h
@@ -40,10 +40,10 @@
 #define ATTINY 1616
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-thefreeman-boost21-mp3431-hdr-dac-argb.c
+#define HWDEF_C_FILE thefreeman/boost21-mp3431-hdr-dac-argb/hwdef.c
 
 // allow using aux LEDs as extra channel modes
-#include "chan-rgbaux.h"
+#include "fsm/chan-rgbaux.h"
 
 // channel modes:
 // * 0. main LEDs
diff --git a/hw/thefreeman/lin16dac/cfg.h b/hw/thefreeman/lin16dac/cfg.h
index 20d2bf5..62230e8 100644
--- a/hw/thefreeman/lin16dac/cfg.h
+++ b/hw/thefreeman/lin16dac/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #define MODEL_NUMBER "1630"
-#include "hwdef-thefreeman-lin16dac.h"
+#include "thefreeman/lin16dac/hwdef.h"
 // ATTINY: 1616
 
 // the button lights up
diff --git a/hw/thefreeman/lin16dac/hwdef.c b/hw/thefreeman/lin16dac/hwdef.c
index 07c7f9e..191444e 100644
--- a/hw/thefreeman/lin16dac/hwdef.c
+++ b/hw/thefreeman/lin16dac/hwdef.c
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "chan-aux.c"
+#include "fsm/chan-aux.c"
 
 void set_level_zero();
 
diff --git a/hw/thefreeman/lin16dac/hwdef.h b/hw/thefreeman/lin16dac/hwdef.h
index c0d0638..79f8382 100644
--- a/hw/thefreeman/lin16dac/hwdef.h
+++ b/hw/thefreeman/lin16dac/hwdef.h
@@ -15,10 +15,10 @@
 #define ATTINY 1616
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-thefreeman-lin16dac.c
+#define HWDEF_C_FILE thefreeman/lin16dac/hwdef.c
 
 // allow using aux LEDs as extra channel modes
-#include "chan-aux.h"
+#include "fsm/chan-aux.h"
 
 // channel modes:
 // * 0. main LEDs
diff --git a/hw/wurkkos/wurkkos-cfg.h b/hw/wurkkos/cfg.h
index b9992fb..b9992fb 100644
--- a/hw/wurkkos/wurkkos-cfg.h
+++ b/hw/wurkkos/cfg.h
diff --git a/hw/wurkkos/fc13/cfg.h b/hw/wurkkos/fc13/cfg.h
index 56161b4..7495f61 100644
--- a/hw/wurkkos/fc13/cfg.h
+++ b/hw/wurkkos/fc13/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 // ATTINY: 1616
-#include "cfg-wurkkos-ts25.h"
+#include "wurkkos/ts25/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0716"
 
diff --git a/hw/wurkkos/ts10-rgbaux/cfg.h b/hw/wurkkos/ts10-rgbaux/cfg.h
index 6770c47..dacedea 100644
--- a/hw/wurkkos/ts10-rgbaux/cfg.h
+++ b/hw/wurkkos/ts10-rgbaux/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 // most things are the same as TS25
-#include "cfg-wurkkos-ts25.h"
+#include "wurkkos/ts25/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0713"
 // ATTINY: 1616
diff --git a/hw/wurkkos/ts10/cfg.h b/hw/wurkkos/ts10/cfg.h
index 90839e7..b554b21 100644
--- a/hw/wurkkos/ts10/cfg.h
+++ b/hw/wurkkos/ts10/cfg.h
@@ -5,8 +5,8 @@
 
 // same as  the  BLF Q8 T1616, mostly (added Dynamic PWM)
 #define MODEL_NUMBER "0714"
-#include "hwdef-wurkkos-ts10.h"
-#include "wurkkos-cfg.h"
+#include "wurkkos/ts10/hwdef.h"
+#include "wurkkos/cfg.h"
 // ATTINY: 1616
 
 // uses forward-facing aux LEDs
diff --git a/hw/wurkkos/ts10/hwdef.c b/hw/wurkkos/ts10/hwdef.c
index 06f5bac..8fa7e55 100644
--- a/hw/wurkkos/ts10/hwdef.c
+++ b/hw/wurkkos/ts10/hwdef.c
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "chan-aux.c"
+#include "fsm/chan-aux.c"
 
 void set_level_zero();
 
diff --git a/hw/wurkkos/ts10/hwdef.h b/hw/wurkkos/ts10/hwdef.h
index e693c99..157f2da 100644
--- a/hw/wurkkos/ts10/hwdef.h
+++ b/hw/wurkkos/ts10/hwdef.h
@@ -16,10 +16,10 @@
 #define ATTINY 1616
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-wurkkos-ts10.c
+#define HWDEF_C_FILE wurkkos/ts10/hwdef.c
 
 // allow using aux LEDs as extra channel modes
-#include "chan-aux.h"
+#include "fsm/chan-aux.h"
 
 // channel modes:
 // * 0. FET+7135 stacked
diff --git a/hw/wurkkos/ts11/cfg.h b/hw/wurkkos/ts11/cfg.h
index 8955731..c4bb59f 100644
--- a/hw/wurkkos/ts11/cfg.h
+++ b/hw/wurkkos/ts11/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 // ATTINY: 1616
-#include "cfg-wurkkos-ts25.h"
+#include "wurkkos/ts25/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0717"
 
diff --git a/hw/wurkkos/ts25/cfg.h b/hw/wurkkos/ts25/cfg.h
index 852e91b..9a3f129 100644
--- a/hw/wurkkos/ts25/cfg.h
+++ b/hw/wurkkos/ts25/cfg.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #define MODEL_NUMBER "0715"
-#include "hwdef-wurkkos-ts25.h"
-#include "wurkkos-cfg.h"
+#include "wurkkos/ts25/hwdef.h"
+#include "wurkkos/cfg.h"
 // ATTINY: 1616
 
 // this light has three aux LED channels: R, G, B
diff --git a/hw/wurkkos/ts25/hwdef.c b/hw/wurkkos/ts25/hwdef.c
index 26c9b0d..f7cef38 100644
--- a/hw/wurkkos/ts25/hwdef.c
+++ b/hw/wurkkos/ts25/hwdef.c
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "chan-rgbaux.c"
+#include "fsm/chan-rgbaux.c"
 
 void set_level_zero();
 
diff --git a/hw/wurkkos/ts25/hwdef.h b/hw/wurkkos/ts25/hwdef.h
index 5eed219..0604432 100644
--- a/hw/wurkkos/ts25/hwdef.h
+++ b/hw/wurkkos/ts25/hwdef.h
@@ -17,10 +17,10 @@
 #define ATTINY 1616
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-wurkkos-ts25.c
+#define HWDEF_C_FILE wurkkos/ts25/hwdef.c
 
 // allow using aux LEDs as extra channel modes
-#include "chan-rgbaux.h"
+#include "fsm/chan-rgbaux.h"
 
 // channel modes:
 // * 0. FET+7135 stacked
diff --git a/ui/anduril/anduril.c b/ui/anduril/anduril.c
index e46eeaf..92b878c 100644
--- a/ui/anduril/anduril.c
+++ b/ui/anduril/anduril.c
@@ -35,7 +35,7 @@
  */
 
 /********* User-configurable options *********/
-#include "config-default.h"
+#include "anduril/config-default.h"
 
 /********* specific settings for known driver types *********/
 // Anduril config file name (set it here or define it at the gcc command line)
@@ -48,33 +48,33 @@
 /********* Include headers which need to be before FSM *********/
 
 // enable FSM features needed by basic ramping functions
-#include "ramp-mode-fsm.h"
+#include "anduril/ramp-mode-fsm.h"
 
 #ifdef USE_FACTORY_RESET
-#include "factory-reset-fsm.h"
+#include "anduril/factory-reset-fsm.h"
 #endif
 
 #ifdef USE_BATTCHECK_MODE
-#include "battcheck-mode-fsm.h"
+#include "anduril/battcheck-mode-fsm.h"
 #endif
 
 #ifdef USE_LOCKOUT_MODE
-#include "lockout-mode-fsm.h"
+#include "anduril/lockout-mode-fsm.h"
 #endif
 
 // enable FSM features needed by strobe modes
-#include "strobe-modes-fsm.h"
+#include "anduril/strobe-modes-fsm.h"
 
 // figure out how many bytes of eeprom are needed,
 // based on which UI features are enabled
 // (include this one last)
-#include "load-save-config-fsm.h"
+#include "anduril/load-save-config-fsm.h"
 
 
 /********* bring in FSM / SpaghettiMonster *********/
 #define USE_IDLE_MODE  // reduce power use while awake and no tasks are pending
 
-#include "spaghetti-monster.h"
+#include "fsm/spaghetti-monster.h"
 
 /********* does this build target have special code to include? *********/
 #ifdef HWDEF_C_FILE
@@ -87,130 +87,130 @@
 
 /********* Include all the regular app headers *********/
 
-#include "off-mode.h"
-#include "ramp-mode.h"
-#include "config-mode.h"
-#include "aux-leds.h"
-#include "misc.h"
+#include "anduril/off-mode.h"
+#include "anduril/ramp-mode.h"
+#include "anduril/config-mode.h"
+#include "anduril/aux-leds.h"
+#include "anduril/misc.h"
 
 #ifdef USE_SUNSET_TIMER
-#include "sunset-timer.h"
+#include "anduril/sunset-timer.h"
 #endif
 
 #ifdef USE_VERSION_CHECK
-#include "version-check-mode.h"
+#include "anduril/version-check-mode.h"
 #endif
 
 #ifdef USE_BATTCHECK_MODE
-#include "battcheck-mode.h"
+#include "anduril/battcheck-mode.h"
 #endif
 
 #ifdef USE_BEACON_MODE
-#include "beacon-mode.h"
+#include "anduril/beacon-mode.h"
 #endif
 
 #ifdef USE_THERMAL_REGULATION
-#include "tempcheck-mode.h"
+#include "anduril/tempcheck-mode.h"
 #endif
 
 #ifdef USE_LOCKOUT_MODE
-#include "lockout-mode.h"
+#include "anduril/lockout-mode.h"
 #endif
 
 #ifdef USE_MOMENTARY_MODE
-#include "momentary-mode.h"
+#include "anduril/momentary-mode.h"
 #endif
 
 #ifdef USE_TACTICAL_MODE
-#include "tactical-mode.h"
+#include "anduril/tactical-mode.h"
 #endif
 
 // allow the channel mode handler even when only 1 mode
 // (so a tint ramp light could still use 3H even if there's no other mode)
 #if defined(USE_CHANNEL_MODES)
-#include "channel-modes.h"
+#include "anduril/channel-modes.h"
 #endif
 
 #ifdef USE_FACTORY_RESET
-#include "factory-reset.h"
+#include "anduril/factory-reset.h"
 #endif
 
 // this one detects its own enable/disable settings
-#include "strobe-modes.h"
+#include "anduril/strobe-modes.h"
 
 #ifdef USE_SOS_MODE
-#include "sos-mode.h"
+#include "anduril/sos-mode.h"
 #endif
 
 #ifdef USE_SMOOTH_STEPS
-#include "smooth-steps.h"
+#include "anduril/smooth-steps.h"
 #endif
 
 // this should be last, so other headers have a chance to declare values
-#include "load-save-config.h"
+#include "anduril/load-save-config.h"
 
 
 /********* Include all the app logic source files *********/
 // (is a bit weird to do things this way,
 //  but it saves a lot of space by letting us use the -fwhole-program flag)
 
-#include "off-mode.c"
-#include "ramp-mode.c"
-#include "load-save-config.c"
-#include "config-mode.c"
-#include "aux-leds.c"
-#include "misc.c"
+#include "anduril/off-mode.c"
+#include "anduril/ramp-mode.c"
+#include "anduril/load-save-config.c"
+#include "anduril/config-mode.c"
+#include "anduril/aux-leds.c"
+#include "anduril/misc.c"
 
 #ifdef USE_SUNSET_TIMER
-#include "sunset-timer.c"
+#include "anduril/sunset-timer.c"
 #endif
 
 #ifdef USE_VERSION_CHECK
-#include "version-check-mode.c"
+#include "anduril/version-check-mode.c"
 #endif
 
 #ifdef USE_BATTCHECK_MODE
-#include "battcheck-mode.c"
+#include "anduril/battcheck-mode.c"
 #endif
 
 #ifdef USE_BEACON_MODE
-#include "beacon-mode.c"
+#include "anduril/beacon-mode.c"
 #endif
 
 #ifdef USE_THERMAL_REGULATION
-#include "tempcheck-mode.c"
+#include "anduril/tempcheck-mode.c"
 #endif
 
 #ifdef USE_LOCKOUT_MODE
-#include "lockout-mode.c"
+#include "anduril/lockout-mode.c"
 #endif
 
 #ifdef USE_MOMENTARY_MODE
-#include "momentary-mode.c"
+#include "anduril/momentary-mode.c"
 #endif
 
 #ifdef USE_TACTICAL_MODE
-#include "tactical-mode.c"
+#include "anduril/tactical-mode.c"
 #endif
 
 #if defined(USE_CHANNEL_MODES)
-#include "channel-modes.c"
+#include "anduril/channel-modes.c"
 #endif
 
 #ifdef USE_FACTORY_RESET
-#include "factory-reset.c"
+#include "anduril/factory-reset.c"
 #endif
 
 #ifdef USE_STROBE_STATE
-#include "strobe-modes.c"
+#include "anduril/strobe-modes.c"
 #endif
 
 #ifdef USE_SOS_MODE
-#include "sos-mode.c"
+#include "anduril/sos-mode.c"
 #endif
 
 #ifdef USE_SMOOTH_STEPS
-#include "smooth-steps.c"
+#include "anduril/smooth-steps.c"
 #endif
 
 
diff --git a/ui/anduril/aux-leds.c b/ui/anduril/aux-leds.c
index af59aa6..1b30d34 100644
--- a/ui/anduril/aux-leds.c
+++ b/ui/anduril/aux-leds.c
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "aux-leds.h"
+#include "anduril/aux-leds.h"
 
 
 #if defined(USE_INDICATOR_LED)
diff --git a/ui/anduril/battcheck-mode.c b/ui/anduril/battcheck-mode.c
index 462540e..c7c80dd 100644
--- a/ui/anduril/battcheck-mode.c
+++ b/ui/anduril/battcheck-mode.c
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "battcheck-mode.h"
+#include "anduril/battcheck-mode.h"
 
 uint8_t battcheck_state(Event event, uint16_t arg) {
     ////////// Every action below here is blocked in the simple UI //////////
diff --git a/ui/anduril/beacon-mode.c b/ui/anduril/beacon-mode.c
index 5aff508..b42272c 100644
--- a/ui/anduril/beacon-mode.c
+++ b/ui/anduril/beacon-mode.c
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "beacon-mode.h"
+#include "anduril/beacon-mode.h"
 
 inline void beacon_mode_iter() {
     // one iteration of main loop()
diff --git a/ui/anduril/candle-mode.c b/ui/anduril/candle-mode.c
index ab47c34..39ec6f2 100644
--- a/ui/anduril/candle-mode.c
+++ b/ui/anduril/candle-mode.c
@@ -3,10 +3,10 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "candle-mode.h"
+#include "anduril/candle-mode.h"
 
 #ifdef USE_SUNSET_TIMER
-#include "sunset-timer.h"
+#include "anduril/sunset-timer.h"
 #endif
 
 uint8_t candle_mode_state(Event event, uint16_t arg) {
diff --git a/ui/anduril/channel-modes.c b/ui/anduril/channel-modes.c
index b2fc8d1..ccac58c 100644
--- a/ui/anduril/channel-modes.c
+++ b/ui/anduril/channel-modes.c
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "channel-modes.h"
+#include "anduril/channel-modes.h"
 
 uint8_t channel_mode_state(Event event, uint16_t arg) {
     #ifdef USE_CHANNEL_MODE_ARGS
diff --git a/ui/anduril/config-mode.c b/ui/anduril/config-mode.c
index 71b0d69..bdee4f6 100644
--- a/ui/anduril/config-mode.c
+++ b/ui/anduril/config-mode.c
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "config-mode.h"
+#include "anduril/config-mode.h"
 
 // general helper function for config modes
 uint8_t number_entry_state(Event event, uint16_t arg);
diff --git a/ui/anduril/factory-reset.c b/ui/anduril/factory-reset.c
index f9fb472..a315c5b 100644
--- a/ui/anduril/factory-reset.c
+++ b/ui/anduril/factory-reset.c
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "factory-reset.h"
+#include "anduril/factory-reset.h"
 
 // allows setting channel mode per animation stage,
 // so it can ramp up in red then explode in white (as one example)
diff --git a/ui/anduril/ff-strobe-modes.c b/ui/anduril/ff-strobe-modes.c
index b7a7303..97bcc87 100644
--- a/ui/anduril/ff-strobe-modes.c
+++ b/ui/anduril/ff-strobe-modes.c
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "ff-strobe-modes.h"
+#include "anduril/ff-strobe-modes.h"
 
 uint8_t boring_strobe_state(Event event, uint16_t arg) {
     // police strobe and SOS, meh
diff --git a/ui/anduril/load-save-config.c b/ui/anduril/load-save-config.c
index aa772e1..41e972c 100644
--- a/ui/anduril/load-save-config.c
+++ b/ui/anduril/load-save-config.c
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "load-save-config-fsm.h"
-#include "load-save-config.h"
+#include "anduril/load-save-config-fsm.h"
+#include "anduril/load-save-config.h"
 
 void load_config() {
     eeprom = (uint8_t *)&cfg;
diff --git a/ui/anduril/lockout-mode.c b/ui/anduril/lockout-mode.c
index 422d081..0e7b673 100644
--- a/ui/anduril/lockout-mode.c
+++ b/ui/anduril/lockout-mode.c
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "lockout-mode.h"
+#include "anduril/lockout-mode.h"
 
 uint8_t lockout_state(Event event, uint16_t arg) {
     #ifdef USE_MOON_DURING_LOCKOUT_MODE
diff --git a/ui/anduril/misc.c b/ui/anduril/misc.c
index 1b92d6f..3715f34 100644
--- a/ui/anduril/misc.c
+++ b/ui/anduril/misc.c
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "misc.h"
+#include "anduril/misc.h"
 
 /* no longer used
 void blink_confirm(uint8_t num) {
diff --git a/ui/anduril/momentary-mode.c b/ui/anduril/momentary-mode.c
index a765142..94f6bc2 100644
--- a/ui/anduril/momentary-mode.c
+++ b/ui/anduril/momentary-mode.c
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "momentary-mode.h"
+#include "anduril/momentary-mode.h"
 
 uint8_t momentary_state(Event event, uint16_t arg) {
     // init strobe mode, if relevant
diff --git a/ui/anduril/off-mode.c b/ui/anduril/off-mode.c
index 0a381b7..97c546e 100644
--- a/ui/anduril/off-mode.c
+++ b/ui/anduril/off-mode.c
@@ -4,10 +4,10 @@
 
 #pragma once
 
-#include "off-mode.h"
+#include "anduril/off-mode.h"
 
 #ifdef USE_SUNSET_TIMER
-#include "sunset-timer.h"
+#include "anduril/sunset-timer.h"
 #endif
 
 // set level smooth maybe
diff --git a/ui/anduril/ramp-mode.c b/ui/anduril/ramp-mode.c
index 4611b4f..aff7be7 100644
--- a/ui/anduril/ramp-mode.c
+++ b/ui/anduril/ramp-mode.c
@@ -4,14 +4,14 @@
 
 #pragma once
 
-#include "ramp-mode.h"
+#include "anduril/ramp-mode.h"
 
 #ifdef USE_SUNSET_TIMER
-#include "sunset-timer.h"
+#include "anduril/sunset-timer.h"
 #endif
 
 #ifdef USE_SMOOTH_STEPS
-#include "smooth-steps.h"
+#include "anduril/smooth-steps.h"
 #endif
 
 
diff --git a/ui/anduril/smooth-steps.c b/ui/anduril/smooth-steps.c
index 9631e41..9924a4e 100644
--- a/ui/anduril/smooth-steps.c
+++ b/ui/anduril/smooth-steps.c
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "smooth-steps.h"
+#include "anduril/smooth-steps.h"
 
 #ifdef USE_SMOOTH_STEPS
 
diff --git a/ui/anduril/sos-mode.c b/ui/anduril/sos-mode.c
index 2a4e97c..45a6fc0 100644
--- a/ui/anduril/sos-mode.c
+++ b/ui/anduril/sos-mode.c
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "sos-mode.h"
+#include "anduril/sos-mode.h"
 
 #ifdef USE_SOS_MODE_IN_BLINKY_GROUP
 uint8_t sos_state(Event event, uint16_t arg) {
diff --git a/ui/anduril/strobe-modes.c b/ui/anduril/strobe-modes.c
index ad17964..ccc4aa0 100644
--- a/ui/anduril/strobe-modes.c
+++ b/ui/anduril/strobe-modes.c
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "strobe-modes.h"
+#include "anduril/strobe-modes.h"
 
 #ifdef USE_STROBE_STATE
 uint8_t strobe_state(Event event, uint16_t arg) {
@@ -322,11 +322,11 @@ inline void bike_flasher_iter() {
 #endif
 
 #ifdef USE_CANDLE_MODE
-#include "candle-mode.c"
+#include "anduril/candle-mode.c"
 #endif
 
 
 #ifdef USE_BORING_STROBE_STATE
-#include "ff-strobe-modes.c"
+#include "anduril/ff-strobe-modes.c"
 #endif
 
diff --git a/ui/anduril/strobe-modes.h b/ui/anduril/strobe-modes.h
index 7dc1df4..058cea5 100644
--- a/ui/anduril/strobe-modes.h
+++ b/ui/anduril/strobe-modes.h
@@ -60,12 +60,12 @@ inline void bike_flasher_iter();
 #endif
 
 #ifdef USE_CANDLE_MODE
-#include "candle-mode.h"
+#include "anduril/candle-mode.h"
 #endif
 
 
 #if defined(USE_POLICE_STROBE_MODE) || defined(USE_SOS_MODE_IN_FF_GROUP)
 #define USE_BORING_STROBE_STATE
-#include "ff-strobe-modes.h"
+#include "anduril/ff-strobe-modes.h"
 #endif
 
diff --git a/ui/anduril/sunset-timer.c b/ui/anduril/sunset-timer.c
index e4fc512..1c3b194 100644
--- a/ui/anduril/sunset-timer.c
+++ b/ui/anduril/sunset-timer.c
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "sunset-timer.h"
+#include "anduril/sunset-timer.h"
 
 uint8_t sunset_timer_state(Event event, uint16_t arg) {
 
diff --git a/ui/anduril/tactical-mode.c b/ui/anduril/tactical-mode.c
index 0035496..5acd902 100644
--- a/ui/anduril/tactical-mode.c
+++ b/ui/anduril/tactical-mode.c
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "tactical-mode.h"
+#include "anduril/tactical-mode.h"
 
 
 uint8_t tactical_state(Event event, uint16_t arg) {
diff --git a/ui/anduril/tempcheck-mode.c b/ui/anduril/tempcheck-mode.c
index 5d160bd..3563f45 100644
--- a/ui/anduril/tempcheck-mode.c
+++ b/ui/anduril/tempcheck-mode.c
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "tempcheck-mode.h"
+#include "anduril/tempcheck-mode.h"
 
 uint8_t tempcheck_state(Event event, uint16_t arg) {
     // 1 click: off
diff --git a/ui/anduril/tint-ramping.c b/ui/anduril/tint-ramping.c
index 9418113..1918072 100644
--- a/ui/anduril/tint-ramping.c
+++ b/ui/anduril/tint-ramping.c
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "tint-ramping.h"
+#include "anduril/tint-ramping.h"
 
 uint8_t tint_ramping_state(Event event, uint16_t arg) {
     static int8_t tint_ramp_direction = 1;
diff --git a/ui/anduril/version-check-mode.c b/ui/anduril/version-check-mode.c
index a47706f..eebe59b 100644
--- a/ui/anduril/version-check-mode.c
+++ b/ui/anduril/version-check-mode.c
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "version-check-mode.h"
+#include "anduril/version-check-mode.h"
 
 // empty state; logic is handled in FSM loop() instead
 uint8_t version_check_state(Event event, uint16_t arg) {
diff --git a/ui/anduril/version-check-mode.h b/ui/anduril/version-check-mode.h
index 72bad3f..4d92dfe 100644
--- a/ui/anduril/version-check-mode.h
+++ b/ui/anduril/version-check-mode.h
@@ -12,7 +12,7 @@
 #error MODEL_NUMBER undefined
 #endif
 
-#include "version.h"
+#include "anduril/version.h"
 const PROGMEM uint8_t version_number[] = MODEL_NUMBER "." VERSION_NUMBER;
 uint8_t version_check_state(Event event, uint16_t arg);
 inline void version_check_iter();