File restructuring and patch for 1.6.1

git-svn-id: https://plugins.svn.wordpress.org/quickstart/trunk@993302 b8457f37-d9ea-0310-8a92-e5e31aec5664
Files renamed during restructuring

git-svn-id: https://plugins.svn.wordpress.org/quickstart/trunk@993304 b8457f37-d9ea-0310-8a92-e5e31aec5664