Moved lib to src