new files and refactorings for the clumping assignment