Updated file structure and removing deleted files