We shouldn't need 'lib/' anymore right?