Organizing the files and getting rid of c files