Restructuring and config.ini dupetest