Trying to get autoconf to work
Reorganization