Refactoring underway. Deleting and adding classes and functions