rename packages, add new watch lib
fix errors