Reorganized files to support generic naming scheme.