Huge reorg. and a lot of modifications.
Remove some old files.