Fix Rakefile
Clean-up organizations loading