Added loggin class and transitioning to new naming convention - Version 3