Fix serialization (for now)
Update composer.json to respect psr4