Removed C.java, replaced with Constants.xml