Basic refactor of SFX holdings.