restructured into public and private dirs