refactored, renamed
updated package.json