Seperated definitions from header files
Accomodate new C files