Remove xspf package into single class