Fixed files to work properly