Initial version
Switch to being purely a library