Moved blocks and items into seperate packages
Part 2 of the previous commit