Moving definitions into two subfolders (for now)