Refactor Collaborators and remove extraneous files