file rename + refactoring
log fixes