Continuing on Excel
Moved to better namespace, renamed classes