Added concepts for diffract. Cleaned up the namespace for diffract.