rename files and class
cleanup
add EventLogger functions