Move blocks stuff inside blocks package