New file structure - removing old files