Update and rename Datasource/Collection.php to Datamapper/Collection.php