Renamed Clean library, see issue #33.
Some import updates.