Source files structure changes