Attempted fix.
changed files so they are more organized.