Added new files not in the project, and fixed extra #import.