Make this right

Move to lib/