Renamed the namespace to the right name.
Implemented sources using a source wrapper class.