Seperated interfaces and implementation
Extract interface
Rename class
Extract interface