Refactoring; Updated Files adapter; General clean up; Tests refactoring;