fix borked `cake watch`
add another file!
a number of changes~
Rework the hell out of the design for more ideal structure