WIP [ci skip]
Moves to lib directory