Move interfaces into their respective .hx files, closes #1080