fixed compilation after reorganizing source tree