Cleaned up the structure for bloqs