reorganized files to resemble package. Tests pass.