More progress. Some entries not landing in the right place in package json file yet.