Refactoring. Finishing class and interface structure.