Refactor to clean up names. Semi botched in Git. Need to configure git-intellij integration better