Fixed xml and java class hierarchy