Separate code out into multiple files