fixes to files structure