Modify classes visibility, refactor abreviatures