Huge Code clean up and Block fixes

Blocks in seprate packages for clean checks add 2 new oreDictionarys my
jasper and sapphire