Fixed Core-424 Get rid of external dependencies on the freedomotic-model package