Added new files, changed others