Moving location of lib to lib

This builds on top of #120.