Move pod into lib structure