Refactoring to support Browser and Server easier. Added Repository Information.