Reorganizing project for testing