Update gitignore and folder structure