Fuel manifests refactoring WIP

DON'T ACCEPT!