Resolved issues with solution building: added missing files