Reorganized directory layout to accomodate library and executable in on place.