Start to move things to own package.
Finish moving csv reader to own module.