Added product screen, reorganized folder structure