Restructured project for a better layout.