big refactoring #9 : merging of horizontal/vertical classes is completed