restructure userCSP add-on according to new UI