Added shotgun and file structure changes