Merged Square and WallHit into one file; Cleaned out unnecessary files