Move core

fixes #6