Lambdas are fun... also rethought package structure