Refactored Code, Shifted data files into folder