Move everything to lib