Cleaned up code, blocks/items now have their own packages