Few changes and added files and folder