Classes now in proper namespace