Moved from lib/ subfolder to src/