Created new files to comply with seperations of concerns.