Reorganizing ...
Reorganizing ...
Added readme; renamed files.
Added Erik's patch.