Some more moving around of source files