Added extra header files and split functions between them
Removed temp files