Re-organized the file