Moving data and util functions into a separate project + changing design a bit