Restructured to allow adding as submodule within fuel/packages