Move things around to allow for direct install from github