Using same project for multiple different firmware

I have a project in VSCode/PIO. It’s got the following structure:

myproject
  src
     kiniNetworkTest.cpp
     kiniNetworkTest.h
     kiniRTCTest.cpp
     kiniRTCTest.h
     kiniTestUtils.cpp
     kiniTestUtils.h
     kiniOLEDTest.cpp
     kiniOLEDTest.h
     kiniNetworkUtils.cpp
     kiniNetworkUtils.h
     kiniRTCUtils.cpp
     kiniRTCUtils.h
     kiniTest.cpp
     kiniTest.h
   lib
   include
   [etc]

I want to add these files:

    kiniSendMessage.cpp
    kiniSendMessage.h
    kiniRTC.cpp
    kiniRTC.h
    kiniMain.cpp
    kiniMain.h

When I go to build, I somehow would like to choose between building test firmware or the main firmware.

I read the following

and it shows how to filter some files, but I am wondering if there is a better way instead of filtering, to specify files individually (like make?).

Are there better ways to do this? Should I make separate projects with shared libraries or shared source files?

I see that I can have a folder inside another folder. Would that give me access to the parent folder’s library?

I’m trying it but it doesn’t look right. I sort of expect to be able to add a src and lib folder for the subfolder, but I don’t think it works that way. I expected the new folder to have the whole structure from a pin file to a lib/build/src/test folders.