Updated all modules to be block-less, and fixed all things