separated starfire into submodule