Move vendor/Joomla to src/Joomla. Update necessary paths.
Merging conflict