Moved code to stdlib
Fixed deps