Changed file structure, amended gitignore