Moved stuff to assets