Setup

changes to setup to aid installation and library management