Updated files with latest version. Redundent confilting files were removed.