reordered the classes and included some more in svn