#286..#310 Refactor structure. Used: firefox v31, Plugin v0.9.7.1-128-gd6b69b8, Wordpress v.4.1-alpha-src, OS v.Ubuntu