Reduced number of files. Removed run.h and fixed some includes