Revert "moving baseTrash up one level, to start integration with rest of code in trash-collection"

This reverts commit e2c7729102d27c5acbc4e90b32557682ec9aa785.
Revert "Revert "moving baseTrash up one level, to start integration with rest of code in trash-collection""

This reverts commit cf61eec475654b3a8751ef8421f839895f050b54.
Revert "moving baseTrash up one level, to start integration with rest of code in trash-collection"

This reverts commit e2c7729102d27c5acbc4e90b32557682ec9aa785.
moved up one level baseTrash