fixed compilation after directory and code clean-ups