Restructured project hirachy.