Removed PieceType.java. Place public enum PieceType in Piece. Fixed
conflicts