diff --git a/client.go b/liveshare/client.go
similarity index 100%
rename from client.go
rename to liveshare/client.go
diff --git a/client_test.go b/liveshare/client_test.go
similarity index 100%
rename from client_test.go
rename to liveshare/client_test.go
diff --git a/options_test.go b/liveshare/options_test.go
similarity index 100%
rename from options_test.go
rename to liveshare/options_test.go
diff --git a/port_forwarder.go b/liveshare/port_forwarder.go
similarity index 100%
rename from port_forwarder.go
rename to liveshare/port_forwarder.go
diff --git a/port_forwarder_test.go b/liveshare/port_forwarder_test.go
similarity index 100%
rename from port_forwarder_test.go
rename to liveshare/port_forwarder_test.go
diff --git a/rpc.go b/liveshare/rpc.go
similarity index 100%
rename from rpc.go
rename to liveshare/rpc.go
diff --git a/session.go b/liveshare/session.go
similarity index 100%
rename from session.go
rename to liveshare/session.go
diff --git a/session_test.go b/liveshare/session_test.go
similarity index 100%
rename from session_test.go
rename to liveshare/session_test.go
diff --git a/socket.go b/liveshare/socket.go
similarity index 100%
rename from socket.go
rename to liveshare/socket.go
diff --git a/ssh.go b/liveshare/ssh.go
similarity index 100%
rename from ssh.go
rename to liveshare/ssh.go
diff --git a/test/server.go b/liveshare/test/server.go
similarity index 100%
rename from test/server.go
rename to liveshare/test/server.go
diff --git a/test/socket.go b/liveshare/test/socket.go
similarity index 100%
rename from test/socket.go
rename to liveshare/test/socket.go