Organize support code into separate files