Some refactoring (moved classes)