Separate into display and main object files