3.5.2 build changes. Removed SidedInventoryAdapter.java to cut down on helper classes.