refactored file names. Will start changing code to match new theory now.