Reorganising all dependencies as packages

This implies that we no longer distinguish between Mac and Windows