restructuring and bugfixing


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@36434 72102866-910b-0410-8b05-ffd578937521