Reorganized the (almost) empty source files