New folder structure
Further coding to make it work