1.1

Reorganization of directory structure and some file names.