Move things to more semantic places