Lib: refactoring
Client: Napojeni na sluzby