fixed file names
Renamed files
tweaks
new scheme