diff --git a/Google.Protobuf/FrameworkPortability.vb b/Google.Protobuf/FrameworkPortability.vb
index 818ed36..bd91989 100644
--- a/Google.Protobuf/FrameworkPortability.vb
+++ b/Google.Protobuf/FrameworkPortability.vb
@@ -30,7 +30,6 @@
 ' OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #End Region
 
-Imports System
 Imports System.Text.RegularExpressions
 
 Namespace Google.Protobuf
diff --git a/Google.Protobuf/LimitedInputStream.vb b/Google.Protobuf/Stream/LimitedInputStream.vb
similarity index 100%
rename from Google.Protobuf/LimitedInputStream.vb
rename to Google.Protobuf/Stream/LimitedInputStream.vb
diff --git a/Google.Protobuf/OutOfSpaceException.vb b/Google.Protobuf/Stream/OutOfSpaceException.vb
similarity index 100%
rename from Google.Protobuf/OutOfSpaceException.vb
rename to Google.Protobuf/Stream/OutOfSpaceException.vb