split out class
point to new file
change class name
accommodate name change