Move base under module
Bump version