fixed .h .c files, now more readable, all the includes have been moved to the .h files