fixed example for 2.0 API, factory example still not working
reorganized SVN tree into branches, tags and trunk
