Fix location of definitions
closes #15