Big restructure, first tests in place. Rake task registered.
Cleaned up incorrect file.