Finished Refactoring of Interface

Deleted depricated files