Enjoy Portugal! I've added all the issues you mentioned (both orgs stuff and general refactoring) to the ckan 2.0 milestone on trac. I'm collecting organizations issues on trac with ckan 2.0 milestone and organizations keyword. I'll also go through the comments on the pull request, and see if there's anything else for trac. Thanks again Toby!