Moved to PSR-4 autoloader. Also removed IDE files
merge conflict resolved