Refactor, files moving all over, setting up new input section with newly refactored portions.