modified directory structure
fix logging method
modified helper class