           dest: 'build/'
           onlyIf: 'modified'
         } ] }
-      peerconnection: Rule.copyModule 'peerconnection'
+      webrtc: Rule.copyModule 'webrtc'
       # Sample apps to demonstrate and run end-to-end tests.
-      sampleChat: Rule.copySampleFiles 'peerconnection/samples/chat-webpage', 'lib'
-      sampleChat2: Rule.copySampleFiles 'peerconnection/samples/chat2-webpage', 'lib'
-      sampleFreedomchat: Rule.copySampleFiles 'coreproviders/samples/freedomchat-chromeapp', 'lib'
+      sampleChat: Rule.copySampleFiles 'webrtc/samples/chat-webpage', 'lib'
+      sampleChat2: Rule.copySampleFiles 'webrtc/samples/chat2-webpage', 'lib'
+      sampleFreedomChat: Rule.copySampleFiles 'freedom/samples/freedomchat-chromeapp', 'lib'
 
     typescript:
       # For bootstrapping of this Gruntfile
       taskmanager: Rule.typescriptSrc 'taskmanager'
       taskmanagerSpecDecl: Rule.typescriptSpecDecl 'taskmanager'
-      # Freedom interfaces (no real spec, only for typescript checking)
-      freedomDeclarations: Rule.typescriptSrc 'freedom/typings'
-      freedomDeclarationsSpecDecl: Rule.typescriptSpecDecl 'freedom/typings'
+
       # The uProxy modules library
       arraybuffers: Rule.typescriptSrc 'arraybuffers'
       arraybuffersSpecDecl: Rule.typescriptSpecDecl 'arraybuffers'

    'jasmine:logging'
  ]

  taskManager.add 'peerconnection', [
    'base'
    'typescript:peerconnection'
    'copy:peerconnection'
  ]

  taskManager.add 'chat', [
    'base'
    'peerconnection'
    'typescript:chat'
    'copy:sampleChat'
  ]

  taskManager.add 'chat2', [
    'base'
    'peerconnection'
    'typescript:chat2'
    'copy:sampleChat2'
  ]

    'uglify:freedomForFirefoxForUproxy'
  ]

  taskManager.add 'freedomChat', [
    'base'
    'freedomForWebpagesForUproxy'
    'typescript:freedomChat'
    'copy:sampleFreedomChat'
  ]

  taskManager.add 'build', [
