Fix project structure. Update ignores.