Update and rename Map.java to TestMap.java

renamed things for consistency.