Major refactor of package structure and started Test-Driven Development.