Changed hierarchy of folders and files at low layers.
Renamed some files.