Separte types into separate files