Moved from lib/ to src/ with namespace