More playing with order of source files