Restructure to work with pip