Organized the header file