Stat - source files structure cleanup