Index: trunk/wp-content/plugins/xpressme/xpressme.php
===================================================================
--- trunk/wp-content/plugins/xpressme/xpressme.php	(revision 18)
+++ trunk/wp-content/plugins/xpressme/xpressme.php	(revision 19)
@@ -8,20 +8,10 @@
 Author URI: http://www.toemon.com
 */
+require_once('xpressme_class.php');
+$xpessme = new XPressME_Class();
 
-add_filter("upload_dir","xpress_upload_filter",	1);		// Change wp-include/wp_upload_dir()
-function xpress_upload_filter($uploads)
-{
-	if (1){		// Select XPressME Configlation
-		$wordpress_dir = ABSPATH ;
-		$xoops_dir = XOOPS_UPLOAD_PATH . '/';
-		$wordpress_base_url = get_option( 'siteurl' );
-		$xoops_upload_url = XOOPS_UPLOAD_URL;
-		
-		$uploads[path] =  str_replace ($wordpress_dir, $xoops_dir, $uploads[path]);
-		$uploads[basedir] = str_replace ($wordpress_dir, $xoops_dir, $uploads[basedir]);
-		$uploads[url] = str_replace ($wordpress_base_url, $xoops_upload_url, $uploads[url]);
-		$uploads[baseurl] = str_replace ($wordpress_base_url, $xoops_upload_url, $uploads[baseurl]);
-	}
-	return $uploads;
-}
+add_action('admin_menu', array(&$xpessme, 'add_option_page'));
+add_action('admin_head', array(&$xpessme, 'add_admin_head'));
+add_filter("upload_dir",array(&$xpessme, 'xpress_upload_filter'),	1);		// Change wp-include/wp_upload_dir()
+
 ?>