Reorganized classes
More refactoring