Redid file structure and added issues.