Moved World.java to world/