renamed files; some cleanup; removed testing code