Restructured project and build file.