Added new files, removed unused