Update and rename A.java to ATag.java