All initial tests passed
Fixed file structure