Moved library stuff to separate folder