Update and rename Type.java to DTYPE.java