Added Notes/Headers/ and changed names