updating refs to files, consolidating includes