Added TeeOutputStream, updated packages paths