changes

Trying to change structure and to get the executable to get into the
rpm.