Restructure first half
restructuring second half
Moving from libraries/joomla to libraries/Joomla