Restructured project packages