Update and rename core.java to javacore.java