Move current solutions (2023) over and organise using cargo workspaces to be a bit cleaner to work with