Moved crystal stuff to own package