Added relevant code to proper files