Initial refactoring into classes