Fixes to source files order