Reorganize libraries to get ready for mirror vs static implementations