Moved structure so the package is installable