Deleted/renamed files and few changes

Made few changes in some files. Deleted unnecesary files