restructured project packages