Refactor - Move/Rename the StAX Stream classes