Moved Diamondbow.java to the correct package and correct all code!!