Refactoring to files
Moving things around