diff --git a/css/sites.css b/css/sites.css
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/push-syndication-server/includes/class-wp-client-factory.php b/includes/class-wp-client-factory.php
similarity index 100%
rename from push-syndication-server/includes/class-wp-client-factory.php
rename to includes/class-wp-client-factory.php
diff --git a/push-syndication-server/includes/class-wp-rest-client.php b/includes/class-wp-rest-client.php
similarity index 100%
rename from push-syndication-server/includes/class-wp-rest-client.php
rename to includes/class-wp-rest-client.php
diff --git a/push-syndication-server/includes/class-wp-xmlrpc-client.php b/includes/class-wp-xmlrpc-client.php
similarity index 100%
rename from push-syndication-server/includes/class-wp-xmlrpc-client.php
rename to includes/class-wp-xmlrpc-client.php
diff --git a/push-syndication-server/includes/interface-wp-client.php b/includes/interface-wp-client.php
similarity index 100%
rename from push-syndication-server/includes/interface-wp-client.php
rename to includes/interface-wp-client.php
diff --git a/push-syndication-server/includes/push-syndicate-encryption.php b/includes/push-syndicate-encryption.php
similarity index 100%
rename from push-syndication-server/includes/push-syndicate-encryption.php
rename to includes/push-syndicate-encryption.php
diff --git a/push-syndication-server/push-syndication-server.php b/push-syndication-server.php
similarity index 100%
rename from push-syndication-server/push-syndication-server.php
rename to push-syndication-server.php
diff --git a/push-syndication-server/css/sites.css b/push-syndication-server/css/sites.css
deleted file mode 100644
index 75159002ac9159b67b3a5936daae46c238696fe9..0000000000000000000000000000000000000000
--- a/push-syndication-server/css/sites.css
+++ /dev/null
@@ -1,8 +0,0 @@
-
-.post-state {
-    visibility: hidden;
-}
-
-.row-actions .inline {
-    display: none;
-}
\ No newline at end of file
diff --git a/push-syndication-xmlrpc-client/push-syndication-xmlrpc-client.php b/push-syndication-xmlrpc-client/push-syndication-xmlrpc-client.php
deleted file mode 100644
index 7348e60e503e225dbdba1869f23545b15a6f54d6..0000000000000000000000000000000000000000
--- a/push-syndication-xmlrpc-client/push-syndication-xmlrpc-client.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/*
-
-**************************************************************************
-
-Plugin Name:  Push Syndication XMLRPC Client
-Plugin URI:
-Description:  XMLRPC client for push syndication server
-Version:      1.0
-Author:       Automattic
-Author URI:   http://automattic.com/wordpress-plugins/
-License:      GPLv2 or later
-
-**************************************************************************/
-
-class Push_Syndication_XMLRPC_Client {
-
-	function __construct() {
-		add_filter( 'xmlrpc_methods' , array( &$this, 'push_syndicate_methods' ) );
-	}
-
-	public function push_syndicate_methods( $methods ) {
-		$methods['pushSyndicateSetOption']          = array( &$this, 'push_syndicate_set_option' );
-		return $methods;
-	}
-
-	public function push_syndicate_set_option( $args ) {
-
-		global $wp_xmlrpc_server;
-		$wp_xmlrpc_server->escape($args);
-
-		$blog_id	= (int) $args[0];
-		$username	= $args[1];
-		$password	= $args[2];
-		$options	= (array) $args[3];
-
-		if ( !$user = $wp_xmlrpc_server->login($username, $password) )
-			return $this->error;
-
-		if ( !current_user_can( 'manage_options' ) )
-			return new IXR_Error( 403, __( 'You are not allowed to update options.' ) );
-
-		foreach( $options as $key => $value ) {
-			if( $key[0] == '_' )
-				continue;
-			update_option( $key, $value );
-		}
-
-		return true;
-
-	}
-
-}
-
-$Push_Syndication_XMLRPC_Client = new Push_Syndication_XMLRPC_Client();
\ No newline at end of file
diff --git a/push-syndication-server/readme.txt b/readme.txt
similarity index 100%
rename from push-syndication-server/readme.txt
rename to readme.txt