Splitting code out to more files