Modified folder structure, also added gif