Index: bp-core/admin/bp-core-upgrade.php
===================================================================
--- bp-core/admin/bp-core-upgrade.php	(revision 3559)
+++ bp-core/admin/bp-core-upgrade.php	(working copy)
@@ -5,7 +5,7 @@
 
 require_once( dirname( dirname( __FILE__ ) ) . '/bp-core-wpabstraction.php' );
 
-register_theme_directory( WP_PLUGIN_DIR . '/buddypress/bp-themes' );
+register_theme_directory( plugin_dir_path( BP_LOADER_FILE ) . 'bp-themes' );
 
 // Install site options on activation
 bp_core_activate_site_options( array( 'bp-disable-account-deletion' => 0, 'bp-disable-avatar-uploads' => 0, 'bp-disable-blogforum-comments' => 0,  'bp-disable-forum-directory' => 0,  'bp-disable-profile-sync' => 0 ) );
@@ -295,7 +295,7 @@
 					<input type="radio" name="bp_components[bp-blogs.php]" value="0"<?php if ( isset( $disabled_components['bp-blogs.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?>
 				</div>
 
-				<img src="<?php echo plugins_url( 'buddypress/screenshot-7.gif' ) ?>" alt="Activity Streams" />
+				<img src="<?php echo plugins_url( '/screenshot-7.gif', BP_LOADER_FILE ); ?>" alt="Activity Streams" />
 					<p><?php _e( "Track new blogs, new posts and new comments across your entire blog network.", 'buddypress' ) ?></p>
 			</div>		
 		</div>
@@ -339,7 +339,7 @@
 					<input type="radio" name="bp_components[bp-activity.php]" value="0"<?php if ( isset( $disabled_components['bp-activity.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?>
 				</div>
 
-				<img src="<?php echo plugins_url( 'buddypress/screenshot-1.gif' ) ?>" alt="Activity Streams" />
+				<img src="<?php echo plugins_url( '/screenshot-1.gif', BP_LOADER_FILE ); ?>" alt="Activity Streams" />
 				<p><?php _e( "Global, personal and group activity streams with threaded commenting, direct posting, favoriting and @mentions. All with full RSS feed and email notification support.", 'buddypress' ) ?></p>
 			</div>
 
@@ -351,7 +351,7 @@
 					<input type="radio" name="bp_components[bp-groups.php]" value="0"<?php if ( isset( $disabled_components['bp-groups.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?>
 				</div>
 
-				<img src="<?php echo plugins_url( 'buddypress/screenshot-3.gif' ) ?>" alt="Activity Streams" />
+				<img src="<?php echo plugins_url( '/screenshot-3.gif', BP_LOADER_FILE ); ?>" alt="Activity Streams" />
 				<p><?php _e( "Powerful public, private or hidden groups allow your users to break the discussion down into specific topics with a separate activity stream and member listing.", 'buddypress' ) ?></p>
 			</div>
 
@@ -363,7 +363,7 @@
 					<input type="radio" name="bp_components[bp-messages.php]" value="0"<?php if ( isset( $disabled_components['bp-messages.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?>
 				</div>
 
-				<img src="<?php echo plugins_url( 'buddypress/screenshot-5.gif' ) ?>" alt="Activity Streams" />
+				<img src="<?php echo plugins_url( '/screenshot-5.gif', BP_LOADER_FILE ); ?>" alt="Activity Streams" />
 				<p><?php _e( "Private messaging will allow your users to talk to each other directly, and in private. Not just limited to one on one discussions, your users can send messages to multiple recipients.", 'buddypress' ) ?></p>
 			</div>
 
@@ -377,7 +377,7 @@
 					<input type="radio" name="bp_components[bp-blogs.php]" value="0"<?php if ( isset( $disabled_components['bp-blogs.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?>
 				</div>
 
-				<img src="<?php echo plugins_url( 'buddypress/screenshot-7.gif' ) ?>" alt="Activity Streams" />
+				<img src="<?php echo plugins_url( '/screenshot-7.gif', BP_LOADER_FILE ); ?>" alt="Activity Streams" />
 					<p><?php _e( "Track new blogs, new posts and new comments across your entire blog network.", 'buddypress' ) ?></p>
 			</div>
 			<?php else: ?>
@@ -395,7 +395,7 @@
 					<input type="radio" name="bp_components[bp-xprofile.php]" value="0"<?php if ( isset( $disabled_components['bp-xprofile.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?>
 				</div>
 
-				<img src="<?php echo plugins_url( 'buddypress/screenshot-2.gif' ) ?>" alt="Activity Streams" />
+				<img src="<?php echo plugins_url( '/screenshot-2.gif', BP_LOADER_FILE ); ?>" alt="Activity Streams" />
 				<p><?php _e( "Fully editable profile fields allow you to define the fields users can fill in to describe themselves. Tailor profile fields to suit your audience.", 'buddypress' ) ?></p>
 			</div>
 
@@ -407,7 +407,7 @@
 					<input type="radio" name="bp_components[bp-friends.php]" value="0"<?php if ( isset( $disabled_components['bp-friends.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?>
 				</div>
 
-				<img src="<?php echo plugins_url( 'buddypress/screenshot-4.gif' ) ?>" alt="Activity Streams" />
+				<img src="<?php echo plugins_url( '/screenshot-4.gif', BP_LOADER_FILE ); ?>" alt="Activity Streams" />
 				<p><?php _e( "Let your users make connections so they can track the activity of others, or filter on only those users they care about the most.", 'buddypress' ) ?></p>
 			</div>
 
@@ -419,7 +419,7 @@
 					<input type="radio" name="bp_components[bp-forums.php]" value="0"<?php if ( isset( $disabled_components['bp-forums.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?>
 				</div>
 
-				<img src="<?php echo plugins_url( 'buddypress/screenshot-6.gif' ) ?>" alt="Activity Streams" />
+				<img src="<?php echo plugins_url( '/screenshot-6.gif', BP_LOADER_FILE ); ?>" alt="Activity Streams" />
 				<p><?php _e( "Full powered discussion forums built directly into groups allow for more conventional in-depth conversations. <strong>NOTE: This will require an extra (but easy) setup step.</strong>", 'buddypress' ) ?></p>
 			</div>
 
@@ -680,7 +680,7 @@
 			<tr>
 				<th>
 					<h5><?php _e( 'Use the Default Theme', 'buddypress' ) ?></h5>
-					<img src="<?php echo plugins_url( '/buddypress/bp-core/images/default.jpg' ) ?>" alt="bp-default" />
+					<img src="<?php echo plugins_url( '/bp-core/images/default.jpg', BP_LOADER_FILE ); ?>" alt="bp-default" />
 				</th>
 				<td>
 					<p><?php _e( 'The default theme contains everything you need to get up and running out of the box. It supports all features and is highly customizable.', 'buddypress' ) ?></p>
@@ -692,7 +692,7 @@
 			<tr>
 				<th>
 					<h5>Automatically Upgrade My WordPress Theme</h5>
-					<img src="<?php echo plugins_url( '/buddypress/bp-core/images/auto_theme.jpg' ) ?>" alt="bp-default" />
+					<img src="<?php echo plugins_url( '/bp-core/images/auto_theme.jpg', BP_LOADER_FILE ); ?>" alt="bp-default" />
 				</th>
 				<td>
 					<p>The BuddyPress [plugin name] plugin will automatically upgrade your existing WordPress theme so it can display BuddyPress pages. Your existing theme's page.php template file will be used to show BuddyPress content.</p>
@@ -705,7 +705,7 @@
 			<tr>
 				<th>
 					<h5><?php _e( 'Manually Upgrade My WordPress Theme', 'buddypress' ) ?>'</h5>
-					<img src="<?php echo plugins_url( '/buddypress/bp-core/images/manual_theme.jpg' ) ?>" alt="bp-default" />
+					<img src="<?php echo plugins_url( '/bp-core/images/manual_theme.jpg', BP_LOADER_FILE ); ?>" alt="bp-default" />
 				</th>
 				<td>
 					<p><?php _e( 'The BuddyPress template pack plugin will run you through the process of manually upgrading your existing WordPress theme. This usually involves following the step by step instructions and copying the BuddyPress template files into your theme then tweaking the HTML to match.', 'buddypress' ) ?></p>
@@ -723,7 +723,7 @@
 			<tr>
 				<th>
 					<h5><?php _e( 'Find a BuddyPress Theme', 'buddypress' ) ?></h5>
-					<img src="<?php echo plugins_url( '/buddypress/bp-core/images/find.jpg' ) ?>" alt="bp-default" />
+					<img src="<?php echo plugins_url( '/bp-core/images/find.jpg', BP_LOADER_FILE ); ?>" alt="bp-default" />
 				</th>
 				<td>
 					<p><?php _e( "There's growing number of BuddyPress themes available for you to download and use. Browse through the list of available themes to see if there is one that matches your needs.", 'buddypress' ) ?></p>
@@ -1278,15 +1278,15 @@
 
 function bp_core_add_admin_menu_styles() {
 	if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG )
-		wp_enqueue_style( 'bp-admin-css', apply_filters( 'bp_core_admin_css', plugins_url( $path = '/buddypress' ) . '/bp-core/css/admin.dev.css' ) );
+		wp_enqueue_style( 'bp-admin-css', apply_filters( 'bp_core_admin_css', plugins_url( '/bp-core/css/admin.dev.css', BP_LOADER_FILE ) ) );
 	else
-		wp_enqueue_style( 'bp-admin-css', apply_filters( 'bp_core_admin_css', plugins_url( $path = '/buddypress' ) . '/bp-core/css/admin.css' ) );
+		wp_enqueue_style( 'bp-admin-css', apply_filters( 'bp_core_admin_css', plugins_url( '/bp-core/css/admin.css', BP_LOADER_FILE ) ) );
 
 	wp_enqueue_script( 'thickbox' );
 	wp_enqueue_style( 'thickbox' );
 ?>
 	<style type="text/css">
-		ul#adminmenu li.toplevel_page_bp-wizard .wp-menu-image a { background-image: url( <?php echo plugins_url( 'buddypress/bp-core/images/admin_menu_icon.png' ) ?> ) !important; background-position: -1px -32px; }
+		ul#adminmenu li.toplevel_page_bp-wizard .wp-menu-image a { background-image: url( <?php echo plugins_url( '/bp-core/images/admin_menu_icon.png', BP_LOADER_FILE ); ?> ) !important; background-position: -1px -32px; }
 		ul#adminmenu li.toplevel_page_bp-wizard:hover .wp-menu-image a { background-position: -1px 0; }
 		ul#adminmenu li.toplevel_page_bp-wizard .wp-menu-image a img { display: none; }
 	</style>
Index: bp-loader.php
===================================================================
--- bp-loader.php	(revision 3559)
+++ bp-loader.php	(working copy)
@@ -11,6 +11,7 @@
 
 define( 'BP_VERSION', '1.3-bleeding' );
 define( 'BP_DB_VERSION', 1225 );
+define( 'BP_LOADER_FILE', __FILE__ );
 
 // Define on which blog ID BuddyPress should run
 if ( !defined( 'BP_ROOT_BLOG' ) )
@@ -21,7 +22,7 @@
  * since an upgrade. If so, load the install/upgrade routine only.
  */
 if ( get_site_option( 'bp-db-version' ) < constant( 'BP_DB_VERSION' ) ) {
-	require_once( WP_PLUGIN_DIR . '/buddypress/bp-core/admin/bp-core-upgrade.php' );
+	require_once( plugin_dir_path( __FILE__ ) . 'bp-core/admin/bp-core-upgrade.php' );
 
 /***
  * If the install or upgrade routine is completed and everything is up to date
@@ -32,7 +33,7 @@
 	 * This file will load in each BuddyPress component based on which
 	 * of the components have been activated on the "BuddyPress" admin menu.
 	 */
-	require_once( WP_PLUGIN_DIR . '/buddypress/bp-core.php' );
+	require_once( plugin_dir_path( __FILE__ ) . 'bp-core.php' );
 	$bp_deactivated = apply_filters( 'bp_deactivated_components', get_site_option( 'bp-deactivated-components' ) );
 
 	do_action( 'bp_core_loaded' );
@@ -151,12 +152,12 @@
 
 	do_action( 'bp_loader_activate' );
 }
-register_activation_hook( 'buddypress/bp-loader.php', 'bp_loader_activate' );
+register_activation_hook( plugin_basename( __FILE__ ), 'bp_loader_activate' );
 
 /* Deactivation Function */
 function bp_loader_deactivate() {
 	do_action( 'bp_loader_deactivate' );
 }
-register_deactivation_hook( 'buddypress/bp-loader.php', 'bp_loader_deactivate' );
+register_deactivation_hook( plugin_basename( __FILE__ ), 'bp_loader_deactivate' );
 
 ?>
Index: bp-forums/bp-forums-admin.php
===================================================================
--- bp-forums/bp-forums-admin.php	(revision 3559)
+++ bp-forums/bp-forums-admin.php	(working copy)
@@ -85,7 +85,7 @@
 		default:
 			if ( !file_exists( BP_PLUGIN_DIR . '/bp-forums/bbpress/' ) ) { ?>
 				<div id="message" class="error">
-					<p><?php printf( __( 'bbPress files were not found. To install the forums component you must download a copy of bbPress and make sure it is in the folder: "%s"', 'buddypress' ), 'wp-content/plugins/buddypress/bp-forums/bbpress/' ) ?></p>
+					<p><?php printf( __( 'bbPress files were not found. To install the forums component you must download a copy of bbPress and make sure it is in the folder: "%s"', 'buddypress' ), str_replace( ABSPATH, '', BP_PLUGIN_DIR ) . '/bp-forums/bbpress/' ); ?></p>
 				</div>
 			<?php } else { ?>
 
Index: bp-core.php
===================================================================
--- bp-core.php	(revision 3559)
+++ bp-core.php	(working copy)
@@ -5,8 +5,8 @@
  * It is important to use plugins_url() core function to obtain
  * the correct scheme used (http or https).
  */
-define( 'BP_PLUGIN_DIR', WP_PLUGIN_DIR . '/buddypress' );
-define( 'BP_PLUGIN_URL', plugins_url( $path = '/buddypress' ) );
+define( 'BP_PLUGIN_DIR', untrailingslashit( plugin_dir_path( __FILE__ ) ) );
+define( 'BP_PLUGIN_URL', untrailingslashit( plugin_dir_url ( __FILE__ ) ) );
 
 /* Load the WP abstraction file so BuddyPress can run on all WordPress setups. */
 require ( BP_PLUGIN_DIR . '/bp-core/bp-core-wpabstraction.php' );
@@ -43,7 +43,7 @@
 	require ( BP_PLUGIN_DIR . '/bp-core/bp-core-adminbar.php' );
 
 /* Register BuddyPress themes contained within the bp-theme folder */
-register_theme_directory( WP_PLUGIN_DIR . '/buddypress/bp-themes' );
+register_theme_directory( BP_PLUGIN_DIR . '/bp-themes' );
 
 
 /* "And now for something completely different" .... */
@@ -1921,7 +1921,7 @@
 function bp_core_update_message() {
 	echo '<p style="color: red; margin: 3px 0 0 0; border-top: 1px solid #ddd; padding-top: 3px">' . __( 'IMPORTANT: <a href="http://codex.buddypress.org/getting-started/upgrading-from-10x/">Read this before attempting to update BuddyPress</a>', 'buddypress' ) . '</p>';
 }
-add_action( 'in_plugin_update_message-buddypress/bp-loader.php', 'bp_core_update_message' );
+add_action( 'in_plugin_update_message-' . plugin_basename( BP_LOADER_FILE ), 'bp_core_update_message' );
 
 /**
  * bp_core_activation_notice()