Restructure layout and add new package.json file