Cleanup2: Missing Source Files Added