Documentation & Some classes renamed