Janitorial work, cleaned up class names

index is the new home page