Update and rename Type.java to GamrType.java