Refactoring: all primitives in one wake file so they can reference each other