Move around classes, remove debug statements

And increased Callandor damage!