Updated how files are included into the system;