Restructuring directories.
Various small changes.