Moved lib/ to src/