Small re-arrangement of source files