Fix Path, And Remove Some Sources, Add Apollo