Added changes in file structure