BuddyPress.org

Here are the contents of my buddypress theme root within bp-themes:

http://avarayr.com/wp-content/themes/avarayr/images/bpthemeroot.jpg

Here are the contents of my wordpress theme root:

http://avarayr.com/wp-content/themes/avarayr/images/wpthemeroot.jpg

Please advise.

If I leave everything as is (without moving the contents from my bp theme to wp theme) and just upgrade automatically I had up with the messed up activity stream and other problems.