Reflect lib organization in spec and update gemspec