Improved project and build file.