Changed Classes to Interfaces (Part 1)