Move vendor/Joomla to src/Joomla. Update necessary paths.
Merging conflict
Updating build.xml with new code location.

Fixing build.xml again