Finalized moving libar to separate lib