Refactored libraries into site package