Move stuff to "core" folder