Reorganization and more unit testing mockups