Reorganization of Pier 2 and Magritte 2 Repositories