clean up folder structure and add a couple things to gitignore