rename organization for preferences saving
more bugs to fix