Added optimized code to the src dir as well.