Updated with new files and paths