Changed Skills structure

Fixed abstraction mistakes