Restructured project hirarchy.