Updated folder structure

Updated .gitignore
Updates some folder names and paths