Reorganize directory
Update package.json