Conversion to PSR-4. Cleaned up composer and tests.