Simplify library removing geck namespace nesting