Re-organized the order of included files