Restructured project to match convention.