updated to v1.1
renamed class files for simplicity/clarity