Ok, I think I've fixed up the function now after looking back at your code.  The directories should be copied in separate now, and I don't believe it should matter what your android working directory is named.