classes renammed and moved