Refactored by adding block container to block bundle
Merge pull request #118 from Bladrak/blockContainer

Refactored by adding block container to block bundle