Fix filesets. Fix finding the main file.