Moved stuff to extras directory