reorganized layout of files