renamed some files, and tweaked the Behavior so the php strict complaints would stop.