Slightly re-organized the addon