making large refactorings for agree
adding new files