Refactor External Classes into Seperate Files