Don't delete test source code
Reorganize class/package structure