[General] Refatoring

Changed modifiers in classes, added setters