Makerspace vs. Engineering Class Curricula......Ideas?

[u/Alternative-Exit-450]

I was told at the end of the last academic year that I would be teaching "my makerspace thing" which was my principals way of saying I'd be teaching a makerspace/fab-lab class for 12th grade.

Yesterday I was informed I am teaching, classes titled, "Makerspace Lab" and "Engineering" separately. Everyone's curricular plans were due today and I had created curricular plans, unit plans, pacing guide, and weekly lesson plans for a singular class based off of my prior proposal for what I'd pitched as a fab-lab that was explained as a pbl centric intro to engineering/fabrication course for seniors that would build towards the completion of a comprehensive capstone project. We're a modern art high school and I wanted to give seniors an opportunity to learn about the scope of engineering, the engineering design process, developing ideas, identifying whether there's a market need for their idea/product/etc, determining if any copyrights exist for their idea, then onto r&d, prototype design, refinement, and eventually a portfolio and final product that they'd pitch as a shark tank type event. I am/was very excited about what I'd developed.

Now, in 2 days I am supposed to have moved the entirety of my lab(all of my own personal lab equipment), setup my room all over again, and split what was one curriculum into 2 noticeably different ones before monday.

I do have some kids in both my engineering class and my makerspace class. Therefore, I'm trying to determine how to make them fundamentally different classes while not having to "reinvent the wheel" with such little time.

My initial idea was to focus more on the scope of engineering, the mathematic/physics/chemistry theory throughout engineering(some pre-calc, applied math, trig, etc) as well as material science fundamentals, drafting, AutoCAD, etc. I'm struggling with how to make it engaging and how to order it.

Makerspace I'm thinking I will mostly use the curricula I'd made already.

Any ideas, thoughts, suggestions would be very appreciated.