Structure refactoring, google analytics