Definitions moved to separate file

closes #6