replaced files with better structure