Structure changes to match version in SVN repository.