Move things to correct folders and adding website