reorganize for use with autotools