Moved contrib to lib and switched to use chipper build