Removed the circular include.
Added convenience module.
Fixed module name.