Test project and reorganizing ...