Clean up folder structure and gitignore