Deleted some unused files and Code modularity