changed enum files to use java-like enums (using classes)