Changed file structure & updated .gitignore