major tweaks
filenames changes, tweaks & fixes