Clean up to conform to js packages conventions