Fixed errors, moved and renamed ItemBlock classes to reflect this.