Made additional changes to file structure