moved some more dimensions to plugins, fixed some issues, removed some more duplicated code etc. Tests will not be green as there fixes to country detection