Remove ektorp/CBLiteHttpClient, it should not have been added (it should have been moved instead)
Move ektorp/CBLiteHttpClient from old folder to new folder.
Remove old Couchbase-Lite-Android-Ektorp project
Remove cblite/javascript and org/elasticsearch java files, these were copied and they should have been moved instead
Rename cblite/javascript and org/elasticsearch java packages to be in new directory
Remove old Couchbase-Lite-Android folder
Remove a bunch of classes under ektorp/tests/ that were copied when they should have moved
Move classes under ektorp/tests/ to the new directory structure
Re-apply modifications
Remove CBLiteJavacript test java files that were originally copied when they should have been moved.
Move CBLiteJavascript test to new directory
Remove old Couchbase-Lite-Android-TestApp folder.  Note: the HeavyAttachments test will need to be re-migrated.  Initial attempt to make it work failed because of dependency of CopySampleAttachmentsActivity (which seems to be inappropriate as an activity)
Move cblistener into new project structure.  at this point it builds successfully
remove Couchbase-Lite-Android-Listener old project
Add read me for CBLiteListener + internal intellij changes