cleaning up packaging; making more modular