Rename test
Split types into multiple files