Added ABXY pad & cleaned up project