Moved embedded structures and registry to a seperate package out of scope for the user.