Fix order of source files