Refactoring Constructor
deleting deprecated files