ice ice baby
change class names
change dirs
cleanup old dirs