Updated file structure, git ignore