reorganize and add google analytics