Source files structure changes. Fixes.