Changed to PSR-4 directory structure and composer autoloading