Clean Classes Separation

Detach methods to classes