All the files created are all new and I have placed under the proposed Smack sub-directory i.e.:
The zip is created with this directory structure layout. You need only to extract all the files into this sub-directory and thing should work.
However your team may want to review if the proposed sub-directory structure is OK for your release and you may want to relocate if necessary. Actually I am not familiar with github pull request and never attempt before. That is reason I did not do it via pull request.
Note: The source is developed and used in aTalk, an android xmpp client. The application can be downloaded from the following link if you would like to try.