Improve organization of theme V2#630

dangershony merged 1 commit intoblock-core:mainblock-core/angor:mainfrom

SuperJMN:refactor/theme-v2-organizationSuperJMN/angor:refactor/theme-v2-organizationCopy head branch name to clipboard